dlubal.api 2.9.11__tar.gz → 2.9.12.dev1__tar.gz

{dlubal_api-2.9.11 → dlubal_api-2.9.12.dev1}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: dlubal.api
-Version: 2.9.11
+Version: 2.9.12.dev1
 Summary: Python Client Library for Dlubal Software APIs powered by gRPC
 Author: Dlubal Software
 Author-email: api@dlubal.com
 License: MIT
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{dlubal_api-2.9.11 → dlubal_api-2.9.12.dev1}/dlubal/api/rfem/application.py

@@ -8,7 +8,8 @@ from dlubal.api.rfem.results import ResultsId
 from dlubal.api.rfem.results.results_query_pb2 import ResultsQuery, ResultsFilter
 import grpc
 from collections.abc import Iterable
-from importlib.metadata import version
+import sys
+from pkg_resources import get_distribution, DistributionNotFound
 import dlubal.api.common.model_id_pb2
 import dlubal.api.rfem.application_pb2
 import dlubal.api.rfem.application_pb2_grpc
@@ -54,7 +55,7 @@ class Application:
         self.api_key = _ApiKey(api_key_name, api_key_value)
         self.channel = init_channel(self.api_key.value, self.url, self.port, self.ssl, self.ssl_file)
         self.stub = dlubal.api.rfem.application_pb2_grpc.ApplicationStub(self.channel) if self.channel else None
-        self.__check_versions()
+        self.__check_connection()
 
     def __enter__(self):
         '''
@@ -81,32 +82,33 @@ class Application:
                 return False
             raise RuntimeError(f"Unexpected error: {str(exc_value)}") from None
 
-    def __check_versions(self):
+    def __check_connection(self):
         '''
-        Check if version of package is compatible with version of RFEM, RSTAB, or RSECTION.
+        Check connection and package version compatibility.
         '''
-        app_info = self.get_application_info()
-        app_version = app_info.version.split('.')
-        app_major = int(app_version[1])
-        app_minor = int(app_version[2])
 
+        # Check connection
         try:
-            dlubal_api_v = version('dlubal.api')
-            dlubal_api_vs = version('dlubal.api').split('.')
-            dlubal_api_major = int(dlubal_api_vs[1])
-            dlubal_api_minor = int(dlubal_api_vs[2])
-        except(ImportError, ModuleNotFoundError):
-            print("dlubal.api version not found.")
-            print("Package is not installed in the current environment.")
-            print("It appears you may be running the application directly from source code.\n")
-            return
+            application_info = self.get_application_info()
+        except grpc._channel._InactiveRpcError as e:
+            sys.tracebacklimit = 0
+            raise RuntimeError(f"gRPC Connection error: {e.code().name} - {e.details()}") from None
 
-        # If the versions differ, print a warning
-        if app_major != dlubal_api_major or app_minor != dlubal_api_minor:
-            print('\033[93mWARNING:\033[0m')
-            print(f'Version mismatch between dlubal.api client package \033[91m{dlubal_api_v}\033[0m and server application {app_info.name}.')
-            print(f'To ensure full compatibility, please use the client version 2.{app_major}.{app_minor}.')
-            print(f'To update, run: \033[92mpython.exe -m pip install --upgrade dlubal.api==2.{app_major}.{app_minor}\033[0m\n')
+        # Check package version compatibility
+        try:
+            client_version = get_distribution('dlubal.api').version
+            client_major, client_minor = map(int, client_version.split('.')[1:3])
+            app_major, app_minor = map(int, application_info.version.split('.')[1:3])
+
+            # If the versions differ, print a warning
+            if app_major != client_major or app_minor != client_minor:
+                print('\033[93mWARNING:\033[0m')
+                print(f'Version mismatch between dlubal.api client package \033[91m{client_version}\033[0m and server application {application_info.name}.')
+                print(f'To ensure full compatibility, please use the client version 2.{app_major}.{app_minor}.')
+                print(f'To update, run: \033[92mpython.exe -m pip install --upgrade dlubal.api==2.{app_major}.{app_minor}\033[0m\n')
+
+        except DistributionNotFound:
+            return
 
     # Functions using packing
 

{dlubal_api-2.9.11 → dlubal_api-2.9.12.dev1}/dlubal.api.egg-info/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: dlubal.api
-Version: 2.9.11
+Version: 2.9.12.dev1
 Summary: Python Client Library for Dlubal Software APIs powered by gRPC
 Author: Dlubal Software
 Author-email: api@dlubal.com
 License: MIT
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{dlubal_api-2.9.11 → dlubal_api-2.9.12.dev1}/setup.py

@@ -19,7 +19,7 @@ readme = (here/"README.md").read_text(encoding="utf-8")
 setup(
     name='dlubal.api',
     # version=version,
-    version="2.9.11",
+    version="2.9.12.dev1",
     python_requires=">=3.10",
     description='Python Client Library for Dlubal Software APIs powered by gRPC',
     long_description=readme,
@@ -29,7 +29,6 @@ setup(
     author_email="api@dlubal.com",
     license="MIT",
     classifiers=[
-        "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",