ansys-saf-glow-engine 2.3.dev0__tar.gz → 2.4.dev0__tar.gz

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansys-saf-glow-engine
-Version: 2.3.dev0
+Version: 2.4.dev0
 Summary: Solution Application Framework / Guided Low-Code Workflow (SAF GLOW) engine
 License: Apache-2.0
 License-File: LICENSE
@@ -31,7 +31,7 @@ Requires-Dist: aiosqlite (>=0.19.0,<1.0)
 Requires-Dist: ansys-bdm-api (>=0.5.0,<1.0)
 Requires-Dist: ansys-bdm-shared-volume (>=0.4.0,<1.0)
 Requires-Dist: ansys-hps-client (>=0.12,<1.0) ; extra == "hps" or extra == "all"
-Requires-Dist: ansys-iam-oidc (>=0.8.0,<1.0)
+Requires-Dist: ansys-iam-oidc (>=0.9.0,<1.0)
 Requires-Dist: ansys-platform-instancemanagement (>=1.0.2,<2.0.0) ; extra == "pim" or extra == "all"
 Requires-Dist: ansys-saf-product-configuration (>=0.22.0,<1.0)
 Requires-Dist: ariadne (>=1.0.1,<2.0.0)
@@ -46,22 +46,21 @@ Requires-Dist: googleapis-common-protos (>=1.52.0,<2.0.0)
 Requires-Dist: gql (>=3.5.0,<4.0.0)
 Requires-Dist: grpcio (>=1.71.2,<2.0.0)
 Requires-Dist: grpcio-health-checking (>=1.24.0,<2.0.0)
-Requires-Dist: httpx (>=0,<1)
-Requires-Dist: httpx2 (>=2.5.0,<3.0.0) ; extra == "test" or extra == "all"
+Requires-Dist: httpx2 (>=2.5.0,<3.0.0)
 Requires-Dist: isoduration (==20.11.0) ; extra == "mcp" or extra == "all"
 Requires-Dist: joserfc (>=1.2.2,<2.0.0)
 Requires-Dist: mcp (==1.28.1) ; extra == "mcp" or extra == "all"
 Requires-Dist: networkx (>=3.0,<4.0)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (>=1.18,<2.0)
-Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.64b0,<0.65)
+Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.64b0,<1.0)
 Requires-Dist: opentelemetry-instrumentation-flask (>=0,<1)
-Requires-Dist: opentelemetry-instrumentation-httpx (>=0,<1)
+Requires-Dist: opentelemetry-instrumentation-httpx (>=0.65b0,<1.0)
 Requires-Dist: opentelemetry-instrumentation-logging (>=0,<1)
 Requires-Dist: opentelemetry-sdk (>=1.39,<2.0)
 Requires-Dist: psutil (>=7.0,<8.0)
 Requires-Dist: pydantic (>=2.13.4,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.0.2,<3.0.0,!=2.6.0)
-Requires-Dist: pytest (>=9.1.0,<10.0.0) ; extra == "test" or extra == "all"
+Requires-Dist: pytest (>=9.0.3,<9.1.0) ; extra == "test" or extra == "all"
 Requires-Dist: pytest-mock (>=3.15.0,<4.0.0) ; extra == "test" or extra == "all"
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-multipart (>=0.0.30,<1.0)

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "poetry-core>=2.0.0", "setuptools>=67.0" ]
 
 [tool.poetry]
 name = "ansys-saf-glow-engine"
-version = "2.3.dev0"
+version = "2.4.dev0"
 description = "Solution Application Framework / Guided Low-Code Workflow (SAF GLOW) engine"
 license = "Apache-2.0"
 authors = [ "ANSYS, Inc. <pyansys.core@ansys.com>" ]
@@ -50,7 +50,7 @@ ariadne = "^1.0.1"
 ansys-bdm-api = { version = ">=0.5.0, <1.0", allow-prereleases = true }
 ansys-bdm-shared-volume = { version = ">=0.4.0, <1.0", allow-prereleases = true }
 ansys-hps-client = { version = ">=0.12, <1.0", optional = true }                           # for using HPS
-ansys-iam-oidc = { version = ">=0.8.0, <1.0", allow-prereleases = true }
+ansys-iam-oidc = { version = ">=0.9.0, <1.0", allow-prereleases = true }
 ansys-platform-instancemanagement = { version = "^1.0.2", optional = true }                # for using PIM
 ansys-saf-product-configuration = { version = ">=0.22.0, <1.0", allow-prereleases = true }
 asyncpg = ">=0.29.0, <1.0"
@@ -63,21 +63,20 @@ googleapis-common-protos = "^1.52.0"
 gql = "^3.5.0"
 grpcio = "^1.71.2"
 grpcio-health-checking = "^1.24.0"
-httpx = "^0"
+httpx2 = "^2.5.0"
 joserfc = "^1.2.2"
 networkx = "^3.0"
 opentelemetry-exporter-otlp-proto-http = "^1.18"
-opentelemetry-instrumentation-fastapi = { version = "^0.64b0", allow-prereleases = true }  # Minimum version compatible with fastapi 0.139
+opentelemetry-instrumentation-fastapi = { version = ">=0.64b0, <1.0", allow-prereleases = true }  # Minimum version compatible with fastapi 0.139
 opentelemetry-instrumentation-flask = { version = "^0", allow-prereleases = true }
-opentelemetry-instrumentation-httpx = { version = "^0", allow-prereleases = true }
+opentelemetry-instrumentation-httpx = { version = ">=0.65b0, <1.0", allow-prereleases = true }  # Minimum version compatible with httpx2
 opentelemetry-instrumentation-logging = { version = "^0", allow-prereleases = true }
 opentelemetry-sdk = "^1.39"
 psutil = "^7.0"
 pydantic = "^2.13.4"
 pydantic-settings = "^2.0.2, !=2.6.0"                                                      # In 2.6.0, they changed how Settings.model_validate() works, breaking everything: https://github.com/pydantic/pydantic-settings/issues/445. It was fixed in 2.6.1.
-pytest = { version = "^9.1.0", optional = true }
+pytest = { version = "~9.0.3", optional = true }
 pytest-mock = { version = "^3.15.0", optional = true }
-httpx2 = { version = "^2.5.0", optional = true }
 python-dotenv = "^1.0.0"
 python-multipart = ">=0.0.30, <1.0"                                                        # needed by fastapi for uploading files
 pyyaml = "^6.0"
@@ -95,7 +94,7 @@ isoduration = { version = "20.11.0", optional = true }
 dash = [ "dash", "dash-extensions" ]
 pim = [ "ansys-platform-instancemanagement" ]
 hps = [ "ansys-hps-client" ]
-test = [ "pytest", "pytest-mock", "httpx2" ]
+test = [ "pytest", "pytest-mock" ]
 mcp = [ "fastmcp", "mcp", "isoduration" ]
 # didn't find a way to dynamically include previous groups, so we need to copy all dependencies
 all = [
@@ -105,7 +104,6 @@ all = [
   "ansys-hps-client",
   "pytest",
   "pytest-mock",
-  "httpx2",
   "fastmcp",
   "mcp",
   "isoduration",
@@ -136,7 +134,7 @@ tox = "^4.4.6"
 optional = true
 [tool.poetry.group.tests.dependencies]
 aiohttp = "^3.10.2"
-ansys-saf-testing = { version = ">=0.13.0, <1.0", allow-prereleases = true, extras = [
+ansys-saf-testing = { version = ">=0.14.0, <1.0", allow-prereleases = true, extras = [
   "docker",
   "selenium",
   "hps",
@@ -144,12 +142,11 @@ ansys-saf-testing = { version = ">=0.13.0, <1.0", allow-prereleases = true, extr
 ] }
 asgi-lifespan = "^2.1.0"
 coverage = "^7.2.6"
-httpx2 = "^2.5.0"
 dash = { version = "^3.0.0", extras = [ "diskcache" ] } # diskcache needed for background callbacks
 docker = "^7.1.0" # lower versions are not compatible with requests >= 2.32 https://github.com/docker/docker-py/pull/3257
 mock = "^4.0.3"
 pyc-wheel = "^1.2.7"
-pytest = "^9.0.0"
+pytest = "~9.0.3"
 pytest-asyncio = "^1.0.0"
 pytest-cov = "^7.0.0"
 pytest-html = "^4.1.1"
@@ -189,7 +186,6 @@ line-length = 120
 extend-exclude = [
   "*_pb2.py",
   "*_pb2_grpc.py",
-  "setup_environment.py",
   "tests/mocks/mock_products/wnua.py",
 ]
 
@@ -225,7 +221,6 @@ lint.per-file-ignores.".poetry/**" = [ "S" ]
 lint.per-file-ignores.".venv/**" = [ "S" ]
 lint.per-file-ignores."benchmarks/**" = [ "S" ]
 lint.per-file-ignores."cache/**" = [ "S" ]
-lint.per-file-ignores."setup_environment.py" = [ "S" ]
 # Ignore `S` rules everywhere except for the `src/` directory.
 lint.per-file-ignores."tests/**.py" = [ "S" ]
 lint.flake8-bugbear.extend-immutable-calls = [
@@ -305,7 +300,7 @@ source = [ "ansys.saf.glow" ]
 
 [tool.coverage.report]
 show_missing = true
-omit = [ "*/pytest-of-*/pytest-*/popen-*/*", "/tmp/*", "setup_environment.py" ]
+omit = [ "*/pytest-of-*/pytest-*/popen-*/*", "/tmp/*" ]
 
 [tool.pyright]
 extraPaths = [ "src" ]
@@ -313,7 +308,6 @@ include = [ "src", "tests", "benchmarks", "doc/source" ]
 exclude = [
   "**/*_pb2.py",
   "**/*_pb2_grpc.py",
-  "setup_environment.py",
 ]
 strict = [ "src", "tests", "benchmarks" ]
 venvPath = "."
@@ -325,5 +319,5 @@ build-system-version = "2.3.2"
 
 [tool.bandit]
 # targets = ["src"]
-exclude_dirs = [ "tests", "setup_environment", ".venv", ".github", ".poetry", "doc", "benchmarks", "cache" ]
-skips = [ "B112", "B603" ]
+exclude_dirs = [ "tests", ".venv", ".github", ".poetry", "doc", "benchmarks", "cache" ]
+skips = [ "B112", "B603" ]

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_client/client.py

@@ -18,7 +18,7 @@ import logging
 from pathlib import Path
 from typing import Any, Generic, TypeVar, cast
 
-import httpx
+import httpx2
 
 from ansys.saf.glow._client.project_proxy import ProjectProxy
 from ansys.saf.glow._config.const import Deployment
@@ -74,7 +74,7 @@ class Client(Generic[T]):
         elif access_token:
             headers["Authorization"] = f"Bearer {access_token}"
         self._access_token = access_token
-        self._http_client = httpx.Client(timeout=300, transport=InjectTraceTransport(), headers=headers)
+        self._http_client = httpx2.Client(timeout=300, transport=InjectTraceTransport(), headers=headers)
         if api_key:
             self._graphql_client = GqlClientConnectionPool(url=f"{url}/graphql", api_key=api_key)
         else:

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_client/project_proxy.py

@@ -21,7 +21,7 @@ from pathlib import Path
 from typing import Any, TypeVar
 
 from ansys.bdm.api import IStorageScope
-import httpx
+import httpx2
 
 from ansys.saf.glow._client.step_proxy import StepProxy
 from ansys.saf.glow._client.storagescope import ClientStorageScope
@@ -42,7 +42,7 @@ class ProjectProxy:
         solution_type: type[Solution],
         url: str,
         external_url: str,
-        http_client: httpx.Client,
+        http_client: httpx2.Client,
         project_files_dir: Path,
         graphql_client: GqlClientConnectionPool,
         settings: Settings,
@@ -69,7 +69,7 @@ class ProjectProxy:
             solution_type: type[Solution],
             url: str,
             external_url: str,
-            http_client: httpx.Client,
+            http_client: httpx2.Client,
             project_files_dir: Path,
             graphql_client: GqlClientConnectionPool,
             access_token: str | None = None,

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_client/step_proxy.py

@@ -20,7 +20,7 @@ from typing import Any, get_type_hints
 from urllib.parse import quote
 
 from fastapi.encoders import jsonable_encoder
-import httpx
+import httpx2
 from pydantic import TypeAdapter
 
 from ansys.saf.glow._core.client_exceptions import BadRequestException, NotFoundException, check
@@ -41,7 +41,7 @@ class StepProxy:
         external_project_url: str,
         step_name: str,
         step_model_type: type[StepModel],
-        http_client: httpx.Client,
+        http_client: httpx2.Client,
         project_files_dir: Path,
         graphql_client: GqlClientConnectionPool,
     ) -> None:

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_client/storagescope.py

@@ -27,7 +27,7 @@ from ansys.bdm.api import (
     IEntityWriter,
     IStorageScope,
 )
-import httpx
+import httpx2
 from pydantic import FutureDate, TypeAdapter, ValidationError
 
 from ansys.saf.glow._bdm.multiplexor import SafMultiplexorStorageScopeFactory
@@ -47,7 +47,7 @@ class ClientStorageScope(IStorageScope):
     def __init__(
         self,
         root_directory: str,
-        http_client: httpx.Client,
+        http_client: httpx2.Client,
         project_url: str,
         project_display_name: str,
         settings: Settings,

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_config/settings.py

@@ -167,6 +167,14 @@ class Settings(BaseSettings):
         default=DEFAULT_GLOW_HPS_CLIENT_ID,
         description="HPS client id for the configuration of the interactive authorization",
     )
+    glow_auth_service_account_client_id: str | None = Field(
+        default=None,
+        description="Client id of the service account.",
+    )
+    glow_auth_service_account_client_secret: str | None = Field(
+        default=None,
+        description="Client secret of the service account.",
+    )
     glow_auth_issuer_url: str | None = Field(
         default=None,
         description="Address of the Identity Provider for authenticated access to the GLOW API.",

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_core/client_exceptions.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import httpx
+import httpx2
 
 
 class SolutionClientError(Exception):
@@ -70,7 +70,7 @@ CLIENT_EXCEPTIONS_BY_GRAPHQL_STATUS: dict[str, type[Exception]] = {
 }
 
 
-def _get_message(r: httpx.Response, raw: str) -> str:
+def _get_message(r: httpx2.Response, raw: str) -> str:
     try:
         return r.json()["detail"]
     except Exception:
@@ -98,7 +98,7 @@ def raise_for_graphql_status(result: dict[str, str]):
     raise exception(message)
 
 
-def check(r: httpx.Response) -> None:
+def check(r: httpx2.Response) -> None:
     if r.status_code // 100 == 2:
         return
     message = _get_message(r, r.text)

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_core/gc.py

@@ -23,13 +23,13 @@ import uuid
 
 from fastapi import BackgroundTasks
 from opentelemetry import trace
-from sqlalchemy.ext.asyncio import create_async_engine
 
 from ansys.saf.glow._bdm.multiplexor import SafMultiplexorStorageScopeFactory
 from ansys.saf.glow._config.const import DatabaseType
 from ansys.saf.glow._config.settings import Settings
 from ansys.saf.glow._core.solution import Solution
 from ansys.saf.glow._crud.crud import Crud
+from ansys.saf.glow._repository.engine import create_glow_async_engine
 from ansys.saf.glow._repository.postgresql import PostgresqlSessionFactory
 from ansys.saf.glow._repository.sqlite_factory import SqliteSessionFactory
 from ansys.saf.glow._server.models import BdmLockModel
@@ -144,7 +144,7 @@ async def cleanup_expired_bdm_locks_on_startup(
         session_factory = SqliteSessionFactory(settings, solution_service)
     else:
         database_url = str(db_location).replace("postgresql:", "postgresql+asyncpg:", 1)
-        engine = create_async_engine(database_url, json_serializer=json.dumps)
+        engine = create_glow_async_engine(database_url, json_serializer=json.dumps)
         try:
             async with engine.connect():
                 # Check whether the PostgreSQL instance exists or not

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_core/instance/decorator.py

@@ -28,7 +28,7 @@ from ansys.saf.glow._core.instance.identification import InstanceIdentificationC
 if TYPE_CHECKING:
     from collections.abc import Callable
 
-    import httpx
+    import httpx2
 
     from ansys.saf.glow._config.settings import Settings
     from ansys.saf.glow._core.instance.manager import ProductInstanceManager
@@ -110,7 +110,7 @@ def instance_decorator_func(
     solution: Solution,
     name_of_step_containing_method: str,
     settings: Settings,
-    http_client: httpx.Client,
+    http_client: httpx2.Client,
     **kwargs: Any,
 ) -> T:
     referenced_step_name = attribute.parse_field_reference(name_of_step_containing_method)[0]
@@ -205,7 +205,7 @@ def instance(
             solution: Solution,
             name_of_step_containing_method: str,
             settings: Settings,
-            http_client: httpx.Client,
+            http_client: httpx2.Client,
             *_: P.args,
             **kwargs: P.kwargs,
         ) -> T:
@@ -295,7 +295,7 @@ def create_instance(
             solution: Solution,
             name_of_step_containing_method: str,
             settings: Settings,
-            http_client: httpx.Client,
+            http_client: httpx2.Client,
             *_: P.args,
             **kwargs: P.kwargs,
         ) -> T:

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_core/instance/hps_job_script_str.py

@@ -17,16 +17,98 @@ HPS_JOB_SCRIPT_CONTENT = """# Copyright (C) 2026 ANSYS, Inc. and/or its affiliat
 
 # type: ignore
 
+import ipaddress
 import os
 import platform
 import socket
 import string
 import tempfile
+from urllib.parse import urlparse
 
 from ansys.hps.client.jms import ProjectApi  # type: ignore
 from ansys.rep.common.logging import log
 from ansys.rep.evaluator.task_manager import ApplicationExecution
 
+def _is_ip_literal(value: str) -> bool:
+    '''Return True if value parses as an IPv4 or IPv6 address literal (not a hostname).'''
+    try:
+        ipaddress.ip_address(value)
+    except ValueError:
+        return False
+    return True
+
+
+def _is_advertisable(ip: str) -> bool:
+    '''Return False for addresses no external caller can reach back on.
+
+    Rejects loopback (127/8, ::1), link-local (169.254/16, fe80::/10),
+    and unspecified (0.0.0.0) addresses using the ipaddress stdlib module
+    for correct IPv4 and IPv6 handling. Non-IP-literal values (such as hostnames)
+    are also rejected: callers should use _is_ip_literal first to distinguish
+    "not an advertisable IP" from "not an IP at all".
+    '''
+    try:
+        addr = ipaddress.ip_address(ip)
+    except ValueError:
+        return False
+    return not (addr.is_loopback or addr.is_link_local or addr.is_unspecified)
+
+
+def _probe_route_to(host: str) -> str | None:
+    '''Return the local address the OS would use to route toward host, if advertisable.
+
+    Uses a UDP "connect" so the OS consults its routing table without sending any data
+    on the wire - works even when host is unreachable. Returns None if the route can't
+    be determined or the resulting local address isn't advertisable.
+    '''
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    try:
+        s.connect((host, 80))
+        ip = s.getsockname()[0]
+    except OSError:
+        return None
+    finally:
+        s.close()
+    return ip if _is_advertisable(ip) else None
+
+
+def detect_host_ip(target_host: str | None = None) -> str:
+    '''Return a best-effort IPv4 address suitable for advertising to external callers.
+
+    If GLOW_PRODUCT_HOST is set, it is returned verbatim (it may be an IP literal or a hostname).
+    Avoids socket.gethostbyname(socket.gethostname()), which can return loopback addresses
+    (127.x.x.x) on systems where the hostname maps to loopback in /etc/hosts.
+
+    Resolution order:
+    1. GLOW_PRODUCT_HOST environment variable (explicit override for NAT/overlay).
+    2. UDP route probe toward target_host, if provided.
+    3. UDP route probe toward 8.8.8.8 as a fallback public sink.
+    4. First advertisable address from socket.getaddrinfo.
+    5. Legacy socket.gethostbyname(socket.gethostname()) for compatibility.
+    '''
+    override = os.environ.get("GLOW_PRODUCT_HOST")
+    if override:
+        return override
+
+    if target_host:
+        ip = _probe_route_to(target_host)
+        if ip:
+            return ip
+
+    ip = _probe_route_to("8.8.8.8")
+    if ip:
+        return ip
+
+    try:
+        for *_, sockaddr in socket.getaddrinfo(socket.gethostname(), None, socket.AF_INET):
+            ip = sockaddr[0]
+            if _is_advertisable(ip):
+                return ip
+    except OSError:
+        pass
+
+    return socket.gethostbyname(socket.gethostname())
+
 
 class GlowInstanceExecution(ApplicationExecution):
     LOCALHOSTS = ["localhost", "127.0.0.1"]
@@ -78,7 +160,16 @@ class GlowInstanceExecution(ApplicationExecution):
         task = project_api.get_tasks(id=self.context.task["task_id"], fields="all")[0]
         task_definition = project_api.get_task_definitions(id=self.context.task["task_definition_id"], fields="all")[0]
 
-        published_host = env.get(self.GLOW_PRODUCT_HOST, socket.gethostbyname(socket.gethostname()))
+        hps_hostname = urlparse(self.context.client.url).hostname
+        published_host = env.get(self.GLOW_PRODUCT_HOST) or detect_host_ip(hps_hostname)
+        if _is_ip_literal(published_host) and not _is_advertisable(published_host):
+            log.warning(
+                f"The detected address for this product instance ('{published_host}') is a loopback, "
+                "link-local, or unspecified address, so other machines will not be able to reach it. "
+                "The Solution API may be unable to connect to the running instance. If this machine has "
+                "multiple network interfaces or runs in a container, set the GLOW_PRODUCT_HOST environment "
+                "variable to an address or hostname that other machines can use to reach it."
+            )
         bind_host = env.get(
             self.GLOW_PRODUCT_BINDING_HOST,
             (

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_core/instance/identification.py

@@ -19,7 +19,7 @@ from typing import Generic
 from urllib.parse import urlparse
 
 from fastapi.encoders import jsonable_encoder
-import httpx
+import httpx2
 
 from ansys.saf.glow._core.instance.recoverystate import TRecoveryStateInfo
 from ansys.saf.glow._server.schemas import CreateInstanceRequest, InstanceResponse, ModifyInstanceRequest
@@ -112,7 +112,7 @@ class InstanceIdentificationClient(AbstractInstanceIdentificationClient[TRecover
     def __init__(
         self,
         instance_identification_url: str,
-        http_client: httpx.Client,
+        http_client: httpx2.Client,
         recovery_state_info_type: type[TRecoveryStateInfo],
         is_create_instance: bool = False,
     ) -> None:

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_core/long_running.py

@@ -19,7 +19,7 @@ import functools
 import time
 from typing import Generic, ParamSpec, TypeVar
 
-import httpx
+import httpx2
 from pydantic import TypeAdapter
 
 from ansys.saf.glow._core.client_exceptions import CLIENT_EXCEPTIONS_BY_CODE, BadRequestException, check
@@ -70,7 +70,7 @@ class LongRunning(Generic[T]):
         step_name: str,
         method_name: str,
         method_url: str,
-        http_client: httpx.Client,
+        http_client: httpx2.Client,
         return_type: T,
     ) -> None:
         self._step_model_type = step_model_type

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_core/transaction.py

@@ -23,7 +23,7 @@ from typing import Annotated, Any, ParamSpec, TypeVar, get_origin, get_type_hint
 from ansys.bdm.api import IStorageScope
 from ansys.iam.oidc import OidcClient
 from fastapi import Body
-import httpx
+import httpx2
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -288,7 +288,7 @@ def transaction(enable_termination_event: bool = False, **kwargs: StepSpec):
             project_url: str,
             solution: Solution,
             name_of_step_containing_method: str,
-            http_client: httpx.Client,
+            http_client: httpx2.Client,
             settings: Settings,
             instance_system_factory: IProductInstanceSystemFactory,
             storage_scope: IStorageScope,
@@ -395,7 +395,7 @@ def transaction(enable_termination_event: bool = False, **kwargs: StepSpec):
 
 
 def _get_solution_configuration(
-    http_client: httpx.Client,
+    http_client: httpx2.Client,
     project_url: str,
     solution_configuration_type: type[TSolutionConfig],
 ) -> TSolutionConfig:

{ansys_saf_glow_engine-2.3.dev0 → ansys_saf_glow_engine-2.4.dev0}/src/ansys/saf/glow/_crud/solution_configuration_relational.py

@@ -26,7 +26,7 @@ from pydantic import BaseModel, PostgresDsn, ValidationError
 from pydantic_core import MultiHostUrl
 from sqlalchemy import update
 from sqlalchemy.exc import OperationalError, ProgrammingError
-from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 
 from ansys.saf.glow._config.const import GLOW_OVERWRITE_SOLUTION_CONFIG, DatabaseType
 from ansys.saf.glow._crud.solution_configuration_abstract import AbstractSolutionConfigurationCRUD
@@ -36,6 +36,7 @@ from ansys.saf.glow._crud.solution_configuration_models import (
     SolutionConfiguration,
     SolutionConfigurationSQL,
 )
+from ansys.saf.glow._repository.engine import create_glow_async_engine
 from ansys.saf.glow._server.exceptions import MalformedDatabaseError, NotFoundError, UnprocessableEntityError
 
 logger = logging.getLogger(__name__)
@@ -80,7 +81,7 @@ class RelationalSolutionConfigurationCRUD(AbstractSolutionConfigurationCRUD[TSol
 
     @asynccontextmanager
     async def _get_session(self) -> AsyncGenerator[AsyncSession, None]:
-        engine = create_async_engine(self._database_url)
+        engine = create_glow_async_engine(self._database_url)
 
         # Run all the transactions on the solution configuration as EXCLUSIVE / SERIALIZABLE.
         # (This means that each transaction has exclusive access to the database for its duration.)
@@ -103,7 +104,7 @@ class RelationalSolutionConfigurationCRUD(AbstractSolutionConfigurationCRUD[TSol
                 raise UnprocessableEntityError(str(e)) from None
 
     async def initialize_database(self, default_solution_configuration: TSolutionConfig) -> None:
-        engine = create_async_engine(self._database_url)
+        engine = create_glow_async_engine(self._database_url)
         async with engine.begin() as conn:
             await conn.run_sync(Base.metadata.create_all)