esd-services-api-client 2.5.10a140.dev5__tar.gz → 2.5.11__tar.gz

{esd_services_api_client-2.5.10a140.dev5 → esd_services_api_client-2.5.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: esd-services-api-client
-Version: 2.5.10a140.dev5
+Version: 2.5.11
 Summary: Python clients for ESD services
 License: Apache 2.0
 Author: ECCO Sneaks & Data

{esd_services_api_client-2.5.10a140.dev5 → esd_services_api_client-2.5.11}/esd_services_api_client/__init__.py

@@ -17,4 +17,4 @@
  Root index.
 """
 
-__version__ = "0.0.0"
+__version__ = "2.5.11"

{esd_services_api_client-2.5.10a140.dev5 → esd_services_api_client-2.5.11}/esd_services_api_client/nexus/modules/__init__.py

@@ -17,5 +17,8 @@
  Import index.
 """
 
-from esd_services_api_client.nexus.modules.mlflow_module import MlflowModule
+try:
+    from esd_services_api_client.nexus.modules.mlflow_module import MlflowModule
+except ModuleNotFoundError:
+    pass
 from esd_services_api_client.nexus.modules.astra_client_module import AstraClientModule

{esd_services_api_client-2.5.10a140.dev5 → esd_services_api_client-2.5.11}/esd_services_api_client/nexus/modules/astra_client_module.py

@@ -40,30 +40,24 @@ class AstraClientModule(Module):
         """
         DI factory method.
         """
-        missing_env_vars = []
 
-        if "CRYSTAL__ALGORITHM_NAME" not in os.environ:
-            missing_env_vars.append("CRYSTAL__ALGORITHM_NAME")
-
-        if "CRYSTAL__ASTRA_KEYSPACE" not in os.environ:
-            missing_env_vars.append("CRYSTAL__ASTRA_KEYSPACE")
-
-        if "PROTEUS__ASTRA_BUNDLE_BYTES" not in os.environ:
-            missing_env_vars.append("PROTEUS__ASTRA_BUNDLE_BYTES")
-
-        if "PROTEUS__ASTRA_CLIENT_ID" not in os.environ:
-            missing_env_vars.append("PROTEUS__ASTRA_CLIENT_ID")
-
-        if "PROTEUS__ASTRA_CLIENT_SECRET" not in os.environ:
-            missing_env_vars.append("PROTEUS__ASTRA_CLIENT_SECRET")
-
-        if missing_env_vars:
-            raise FatalStartupConfigurationError(", ".join(missing_env_vars))
-
-        return AstraClient(
-            client_name=os.getenv("CRYSTAL__ALGORITHM_NAME"),
-            keyspace=os.getenv("CRYSTAL__ASTRA_KEYSPACE"),
-            secure_connect_bundle_bytes=os.getenv("PROTEUS__ASTRA_BUNDLE_BYTES"),
-            client_id=os.getenv("PROTEUS__ASTRA_CLIENT_ID"),
-            client_secret=os.getenv("PROTEUS__ASTRA_CLIENT_SECRET"),
+        required_env_vars = [
+            "NEXUS__ALGORITHM_NAME",
+            "NEXUS__ASTRA_KEYSPACE",
+            "NEXUS__ASTRA_BUNDLE_BYTES",
+            "NEXUS__ASTRA_CLIENT_ID",
+            "NEXUS__ASTRA_CLIENT_SECRET",
+        ]
+
+        if all(map(lambda v: v in os.environ, required_env_vars)):
+            return AstraClient(
+                client_name=os.getenv("NEXUS__ALGORITHM_NAME"),
+                keyspace=os.getenv("NEXUS__ASTRA_KEYSPACE"),
+                secure_connect_bundle_bytes=os.getenv("NEXUS__ASTRA_BUNDLE_BYTES"),
+                client_id=os.getenv("NEXUS__ASTRA_CLIENT_ID"),
+                client_secret=os.getenv("NEXUS__ASTRA_CLIENT_SECRET"),
+            )
+
+        raise FatalStartupConfigurationError(
+            f"Astra client requires these environment variables: {required_env_vars}"
         )

{esd_services_api_client-2.5.10a140.dev5 → esd_services_api_client-2.5.11}/esd_services_api_client/nexus/telemetry/recorder.py

@@ -87,7 +87,6 @@ class TelemetryRecorder(NexusCoreObject):
                         self._telemetry_base_path,
                         "telemetry_group=inputs",
                         f"entity_name={entity_name}",
-                        f"request_id={run_id}",
                         run_id,
                     ),
                     data_format="null",

{esd_services_api_client-2.5.10a140.dev5 → esd_services_api_client-2.5.11}/esd_services_api_client/nexus/telemetry/user_telemetry_recorder.py

@@ -107,7 +107,7 @@ class UserTelemetryRecorder(Generic[TPayload, TResult], ABC):
         telemetry_base_path: str,
         run_id: str,
         **inputs: DataFrame,
-    ):
+    ) -> None:
         """
         Record user-defined telemetry data.
         """
@@ -119,10 +119,10 @@ class UserTelemetryRecorder(Generic[TPayload, TResult], ABC):
                 "recorder": self.__class__.alias().upper(),
             },
         )
-        async def _measured_recording(**run_args) -> UserTelemetry:
+        async def _measured_recording(**run_args) -> UserTelemetry | None:
             return await self._compute(**run_args)
 
-        telemetry: UserTelemetry = await partial(
+        telemetry: UserTelemetry | None = await partial(
             _measured_recording,
             **(
                 {
@@ -137,6 +137,12 @@ class UserTelemetryRecorder(Generic[TPayload, TResult], ABC):
             logger=self._logger,
         )()
 
+        if telemetry is None:
+            self._logger.info(
+                f"No telemetry to record for UserTelemetryRecorder {self.__class__.alias()}"
+            )
+            return
+
         self._storage_client.save_data_as_blob(
             data=telemetry.telemetry,
             blob_path=DataSocket(
@@ -146,7 +152,6 @@ class UserTelemetryRecorder(Generic[TPayload, TResult], ABC):
                     "telemetry_group=user",
                     f"recorder_class={self.__class__.alias()}",
                     telemetry.telemetry_path,  # path join eliminates empty segments
-                    f"request_id={run_id}",
                     run_id,
                 ),
                 data_format="null",

{esd_services_api_client-2.5.10a140.dev5 → esd_services_api_client-2.5.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "esd-services-api-client"
-version = "v2.5.10a140.dev5"
+version = "2.5.11"
 description = "Python clients for ESD services"
 authors = ["ECCO Sneaks & Data <esdsupport@ecco.com>"]
 maintainers = ['GZU <gzu@ecco.com>', 'JRB <ext-jrb@ecco.com>', 'VISA <visa@ecco.com>']

esd_services_api_client-2.5.10a140.dev5/esd_services_api_client/_version.py

@@ -1 +0,0 @@
-__version__ = 'v2.5.10a140.dev5'