Skip to content
Merged
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
3 changes: 1 addition & 2 deletions src/ansys/fluent/core/fluent_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import psutil

from ansys.fluent.core.services import service_creator
from ansys.fluent.core.services.health_check import HealthCheckService
from ansys.fluent.core.services.scheme_eval import SchemeEvalService
from ansys.fluent.core.utils.execution import timeout_exec, timeout_loop
from ansys.platform.instancemanagement import Instance
Expand Down Expand Up @@ -295,7 +294,7 @@ def __init__(
[("password", password)] if password else []
)

self.health_check_service = HealthCheckService(
self.health_check_service = service_creator("health_check").create(
self._channel, self._metadata, self.error_state
)
# At this point, the server must be running. If the following check_health()
Expand Down
8 changes: 8 additions & 0 deletions src/ansys/fluent/core/services/__init__.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
from ansys.fluent.core.services.batch_ops import BatchOpsService
from ansys.fluent.core.services.datamodel_se import (
DatamodelService as DatamodelService_SE,
)
from ansys.fluent.core.services.datamodel_tui import (
DatamodelService as DatamodelService_TUI,
)
from ansys.fluent.core.services.events import EventsService
from ansys.fluent.core.services.field_data import FieldData, FieldInfo
from ansys.fluent.core.services.health_check import HealthCheckService
from ansys.fluent.core.services.monitor import MonitorsService
from ansys.fluent.core.services.reduction import Reduction
from ansys.fluent.core.services.scheme_eval import SchemeEval
from ansys.fluent.core.services.settings import SettingsService
from ansys.fluent.core.services.svar import SVARData, SVARService
from ansys.fluent.core.services.transcript import TranscriptService

_service_cls_by_name = {
"health_check": HealthCheckService,
"datamodel": DatamodelService_SE,
"tui": DatamodelService_TUI,
"settings": SettingsService,
"scheme_eval": SchemeEval,
"events": EventsService,
"field_data": FieldData,
"field_info": FieldInfo,
"monitors": MonitorsService,
"reduction": Reduction,
"svar": SVARService,
"svar_data": SVARData,
"transcript": TranscriptService,
"batch_ops": BatchOpsService,
}


Expand Down
15 changes: 9 additions & 6 deletions src/ansys/fluent/core/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
from ansys.fluent.core.fluent_connection import FluentConnection
from ansys.fluent.core.journaling import Journal
from ansys.fluent.core.services import service_creator
from ansys.fluent.core.services.batch_ops import BatchOpsService
from ansys.fluent.core.services.events import EventsService
from ansys.fluent.core.services.field_data import FieldDataService
from ansys.fluent.core.session_shared import ( # noqa: F401
_CODEGEN_MSG_DATAMODEL,
Expand Down Expand Up @@ -122,7 +120,10 @@ def build_from_fluent_connection(
self._preferences = None
self.journal = Journal(self.scheme_eval)

self.transcript = self.fluent_connection.create_grpc_service(Transcript)
self._transcript_service = service_creator("transcript").create(
fluent_connection._channel, fluent_connection._metadata
)
self.transcript = Transcript(self._transcript_service)
if fluent_connection.start_transcript:
self.transcript.start()

Expand All @@ -142,10 +143,12 @@ def build_from_fluent_connection(
self.datamodel_events = DatamodelEvents(self.datamodel_service_se)
self.datamodel_events.start()

self._batch_ops_service = self.fluent_connection.create_grpc_service(
BatchOpsService
self._batch_ops_service = service_creator("batch_ops").create(
fluent_connection._channel, fluent_connection._metadata
)
self.events_service = service_creator("events").create(
fluent_connection._channel, fluent_connection._metadata
)
self.events_service = self.fluent_connection.create_grpc_service(EventsService)
self.events_manager = EventsManager(
self.events_service, self.error_state, self.fluent_connection._id
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from typing import Optional

from ansys.api.fluent.v0 import transcript_pb2 as TranscriptModule
from ansys.fluent.core.services.transcript import TranscriptService
from ansys.fluent.core.streaming_services.streaming import StreamingService


Expand All @@ -27,12 +26,12 @@ class Transcript(StreamingService):

_writing_transcript_to_interpreter = False

def __init__(self, channel, metadata):
def __init__(self, transcript_service):
"""__init__ method of Transcript class."""
super().__init__(
stream_begin_method="BeginStreaming",
target=Transcript._process_streaming,
streaming_service=TranscriptService(channel, metadata),
streaming_service=transcript_service,
)
self.callback_ids = []

Expand Down