Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/changelog.d/4941.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update codebase w.r.t. GRPC updates.
4 changes: 2 additions & 2 deletions src/ansys/fluent/core/data_model_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from threading import RLock
from typing import Any, Dict, List, Optional

from ansys.api.fluent.v0.variant_pb2 import Variant
from ansys.api.fluent.v1.variant_pb2 import Variant
from ansys.fluent.core.utils.fluent_version import FluentVersion

StateType = (
Expand Down Expand Up @@ -256,7 +256,7 @@ def update_source_with_state(state_field):
# Handle variant vector state
if state.HasField("variant_vector_state"):
updater_fn(source, key, [])
for item in state.variant_vector_state.item:
for item in state.variant_vector_state.items:
self._update_cache_from_variant_state(
rules,
source,
Expand Down
2 changes: 1 addition & 1 deletion src/ansys/fluent/core/file_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from deprecated.sphinx import deprecated
import numpy as np

from ansys.api.fluent.v0.field_data_pb2 import DataLocation
from ansys.api.fluent.v1.field_data_pb2 import DataLocation
from ansys.fluent.core import PyFluentDeprecationWarning
from ansys.fluent.core.field_data_interfaces import (
BaseFieldInfo,
Expand Down
34 changes: 16 additions & 18 deletions src/ansys/fluent/core/services/app_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

import grpc

from ansys.api.fluent.v0 import app_utilities_pb2 as AppUtilitiesProtoModule
from ansys.api.fluent.v0 import app_utilities_pb2_grpc as AppUtilitiesGrpcModule
from ansys.api.fluent.v1 import app_utilities_pb2 as AppUtilitiesProtoModule
from ansys.api.fluent.v1 import app_utilities_pb2_grpc as AppUtilitiesGrpcModule
from ansys.fluent.core._types import PathType
from ansys.fluent.core.services.interceptors import (
BatchInterceptor,
Expand Down Expand Up @@ -125,24 +125,22 @@ def is_solution_data_available(
return self._stub.IsSolutionDataAvailable(request, metadata=self._metadata)

def register_pause_on_solution_events(
self, request: AppUtilitiesProtoModule.RegisterPauseOnSolutionEventsRequest
) -> AppUtilitiesProtoModule.RegisterPauseOnSolutionEventsResponse:
self, request: AppUtilitiesProtoModule.RegisterSolutionEventsPauseRequest
) -> AppUtilitiesProtoModule.RegisterSolutionEventsPauseResponse:
"""Register on pause solution events RPC of AppUtilities service."""
return self._stub.RegisterPauseOnSolutionEvents(
request, metadata=self._metadata
)
return self._stub.RegisterSolutionEventsPause(request, metadata=self._metadata)

def resume_on_solution_event(
self, request: AppUtilitiesProtoModule.ResumeOnSolutionEventRequest
) -> AppUtilitiesProtoModule.ResumeOnSolutionEventResponse:
self, request: AppUtilitiesProtoModule.ResumeSolutionEventRequest
) -> AppUtilitiesProtoModule.ResumeSolutionEventResponse:
"""Resume on solution event RPC of AppUtilities service."""
return self._stub.ResumeOnSolutionEvent(request, metadata=self._metadata)
return self._stub.ResumeSolutionEvent(request, metadata=self._metadata)

def unregister_pause_on_solution_events(
self, request: AppUtilitiesProtoModule.UnregisterPauseOnSolutionEventsRequest
) -> AppUtilitiesProtoModule.UnregisterPauseOnSolutionEventsResponse:
self, request: AppUtilitiesProtoModule.UnregisterSolutionEventsPauseRequest
) -> AppUtilitiesProtoModule.UnregisterSolutionEventsPauseResponse:
"""Unregister on pause solution events RPC of AppUtilities service."""
return self._stub.UnregisterPauseOnSolutionEvents(
return self._stub.UnregisterSolutionEventsPause(
request, metadata=self._metadata
)

Expand Down Expand Up @@ -392,7 +390,7 @@ def get_app_mode(self) -> Enum:
request = AppUtilitiesProtoModule.GetAppModeRequest()
response = self.service.get_app_mode(request)
match response.app_mode:
case AppUtilitiesProtoModule.APP_MODE_UNKNOWN:
case AppUtilitiesProtoModule.APP_MODE_UNSPECIFIED:
raise ValueError("Unknown app mode.")
case AppUtilitiesProtoModule.APP_MODE_MESHING:
return pyfluent.FluentMode.MESHING
Expand Down Expand Up @@ -445,8 +443,8 @@ def is_solution_data_available(self) -> bool:

def register_pause_on_solution_events(self, solution_event: SolverEvent) -> int:
"""Register pause on solution events."""
request = AppUtilitiesProtoModule.RegisterPauseOnSolutionEventsRequest()
request.solution_event = AppUtilitiesProtoModule.SOLUTION_EVENT_UNKNOWN
request = AppUtilitiesProtoModule.RegisterPauseSolutionEventsRequest()
request.solution_event = AppUtilitiesProtoModule.SOLUTION_EVENT_UNSPECIFIED
match solution_event:
case SolverEvent.ITERATION_ENDED:
request.solution_event = (
Expand All @@ -461,13 +459,13 @@ def register_pause_on_solution_events(self, solution_event: SolverEvent) -> int:

def resume_on_solution_event(self, registration_id: int) -> None:
"""Resume on solution event."""
request = AppUtilitiesProtoModule.ResumeOnSolutionEventRequest()
request = AppUtilitiesProtoModule.ResumeSolutionEventRequest()
request.registration_id = registration_id
self.service.resume_on_solution_event(request)

def unregister_pause_on_solution_events(self, registration_id: int) -> None:
"""Unregister pause on solution events."""
request = AppUtilitiesProtoModule.UnregisterPauseOnSolutionEventsRequest()
request = AppUtilitiesProtoModule.UnregisterPauseSolutionEventsRequest()
request.registration_id = registration_id
self.service.unregister_pause_on_solution_events(request)

Expand Down
4 changes: 2 additions & 2 deletions src/ansys/fluent/core/services/batch_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
from google.protobuf.message import Message
import grpc

import ansys.api.fluent.v0 as api
from ansys.api.fluent.v0 import batch_ops_pb2, batch_ops_pb2_grpc
import ansys.api.fluent.v1 as api
from ansys.api.fluent.v1 import batch_ops_pb2, batch_ops_pb2_grpc

_TBatchOps = TypeVar("_TBatchOps", bound="BatchOps")

Expand Down
Loading
Loading