aas-http-client 0.1.91__py3-none-any.whl → 0.2.0__py3-none-any.whl

aas_http_client/wrapper/sdk_wrapper.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 import basyx.aas.adapter.json
 
-from basyx.aas.model import AssetAdministrationShell, Reference, Submodel
+from basyx.aas.model import AssetAdministrationShell, Reference, Submodel, ModelReference
 from aas_http_client.client import AasHttpClient, _create_client
 logger = logging.getLogger(__name__)
 
@@ -37,7 +37,7 @@ class SdkWrapper():
 
         return self._client.put_shells(identifier, aas_data)
 
-    def put_shells_submodels(self, aas_id: str, submodel_id: str, submodel: Submodel) -> bool:
+    def put_shells_submodels_by_id(self, aas_id: str, submodel_id: str, submodel: Submodel) -> bool:
         """Update a submodel by its ID for a specific Asset Administration Shell (AAS).
 
         :param aas_id: ID of the AAS to update the submodel for
@@ -85,11 +85,16 @@ class SdkWrapper():
         :return: AAS object or None if an error occurred
         """
         content: dict = self._client.get_shells_by_id(aas_id)
-        return json.load(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
+        aas_dict_string = json.dumps(content)
+        return json.loads(aas_dict_string, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
     def get_shells_reference_by_id(self, aas_id: str) -> Reference | None:
-        content: dict = self._client.get_shells_reference_by_id(aas_id)
-        return json.load(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
+        #workaround because serialization not working
+        aas = self.get_shells_by_id(aas_id)
+        return ModelReference.from_referable(aas)
+        
+        # content: dict = self._client.get_shells_reference_by_id(aas_id)
+        # return json.loads(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
     def get_shells_submodels_by_id(self, aas_id: str, submodel_id: str) -> Submodel | None:
         """Get a submodel by its ID for a specific Asset Administration Shell (AAS).
@@ -99,7 +104,8 @@ class SdkWrapper():
         :return: Submodel object or None if an error occurred
         """
         content: dict = self._client.get_shells_submodels_by_id(aas_id, submodel_id)
-        return json.load(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
+        sm_dict_string = json.dumps(content)
+        return json.loads(sm_dict_string, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
     def delete_shells_by_id(self, aas_id: str) -> bool:
         """Get an Asset Administration Shell (AAS) by its ID from the REST API.
@@ -176,8 +182,9 @@ class SdkWrapper():
         if not isinstance(content, dict):
             logger.error(f"Invalid submodel data: {content}")
             return None
-#
-        return json.loads(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
+        
+        sm_dict_string = json.dumps(content)
+        return json.loads(sm_dict_string, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
     def patch_submodel_by_id(self, submodel_id: str, submodel: Submodel):
         sm_dict_string = json.dumps(submodel, cls=basyx.aas.adapter.json.AASToJsonEncoder)
@@ -248,5 +255,10 @@ def create_wrapper_by_config(config_file: Path, password: str = "") -> AasHttpCl
         logger.debug(f"Server config  file '{config_file}' found.")
 
     wrapper = SdkWrapper()
-    wrapper._client = _create_client(config_string, password)                           
+    client = _create_client(config_string, password)
+    
+    if not client:
+        return None
+    
+    wrapper._client = _create_client(config_string, password)       
     return wrapper

{aas_http_client-0.1.91.dist-info → aas_http_client-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.1.91
+Version: 0.2.0
 Summary: Generic HTTP client for communicating with various types of AAS servers
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: # :em engineering methods AG Software License

{aas_http_client-0.1.91.dist-info → aas_http_client-0.2.0.dist-info}/RECORD

@@ -6,9 +6,9 @@ aas_http_client/demo/demo_process.py,sha256=-9-oQEi_B08W-POl2SVP4COodGPHN3mTw9rr
 aas_http_client/demo/logging_handler.py,sha256=VJtZ4u3x_LhYZQtfNck7FuXhGFZm7gid0uDhvf9GjJ8,5596
 aas_http_client/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aas_http_client/utilities/model_builder.py,sha256=bL4hy3uHh1Y_uL6KmLIfo9ORiUqWNlyToJrAt8G1rpw,3877
-aas_http_client/wrapper/sdk_wrapper.py,sha256=O61Q32zlWxsNqpb4p811GbPd2Un9VGLY_pXR5Q-0QTg,10395
-aas_http_client-0.1.91.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
-aas_http_client-0.1.91.dist-info/METADATA,sha256=X8CH-88IlO_ZZyatIOqYZJ38AdO042bZ5XMmfAkFFxg,8913
-aas_http_client-0.1.91.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_http_client-0.1.91.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
-aas_http_client-0.1.91.dist-info/RECORD,,
+aas_http_client/wrapper/sdk_wrapper.py,sha256=Zgk1khEAePU9nKKmFbe-GWm6hsUplBQ9kLJHcFRcbjU,10828
+aas_http_client-0.2.0.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
+aas_http_client-0.2.0.dist-info/METADATA,sha256=waYKaIXICM72kDFG-OirJRq53hD0_9tCPnkOdSGl57s,8912
+aas_http_client-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_http_client-0.2.0.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
+aas_http_client-0.2.0.dist-info/RECORD,,