esd-services-api-client 2.5.10a140.dev5__tar.gz → 2.5.10a140.dev7__tar.gz

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

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

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

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

{esd_services_api_client-2.5.10a140.dev5 → esd_services_api_client-2.5.10a140.dev7}/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.10a140.dev7}/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.10a140.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "esd-services-api-client"
-version = "v2.5.10a140.dev5"
+version = "v2.5.10a140.dev7"
 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'