aas-standard-parser 0.2.8__py3-none-any.whl → 0.3.1__py3-none-any.whl

aas_standard_parser/submodel_json_parser.py

@@ -5,11 +5,10 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-def get_value_from_semantic_id_by_index(submodel_data: dict, index: int) -> str | None:
+def get_value_from_semantic_id_by_index(submodel_data: dict, index: int = 0) -> str | None:
     """Retrieve the value from the semantic ID from a submodel JSON dictionary by index.
 
     :param submodel_data: The submodel data as a dictionary.
-
     :param index: The index to access if the element is a list or collection, defaults to 0.
     :return: The value of the found submodel element or None if not found.
     """

aas_standard_parser/utils.py

@@ -1,11 +1,15 @@
 """Utility functions for AAS standard parser."""
 
 import json
+import logging
 from pathlib import Path
+from typing import Any
 
-from aas_http_client import sdk_tools
+import basyx.aas.adapter.json
 from basyx.aas import model
 
+logger = logging.getLogger(__name__)
+
 
 def create_submodel_from_file(file_path: str) -> model.Submodel:
     """Loads a Submodel structure from a given JSON file and converts it into a model.Submodel object from the python SDK framework.
@@ -24,4 +28,23 @@ def create_submodel_from_file(file_path: str) -> model.Submodel:
         template_data = json.load(f)
 
     # Load the template JSON into a Submodel object
-    return sdk_tools.convert_to_object(template_data)
+    return _convert_to_object(template_data)
+
+
+def _convert_to_object(content: dict) -> Any | None:
+    """Convert a dictionary to a BaSyx SDK framework object.
+
+    :param content: dictionary to convert
+    :return: BaSyx SDK framework object or None
+    """
+    if not content or len(content) == 0:
+        logger.debug("Empty content provided for conversion to object.")
+        return None
+
+    try:
+        dict_string = json.dumps(content)
+        return json.loads(dict_string, cls=basyx.aas.adapter.json.json_deserialization.AASFromJsonDecoder)
+    except Exception as e:
+        logger.error(f"Decoding error: {e}")
+        logger.error(f"In JSON: {content}")
+        return None

{aas_standard_parser-0.2.8.dist-info → aas_standard_parser-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-standard-parser
-Version: 0.2.8
+Version: 0.3.1
 Summary: Some auxiliary functions for parsing standard submodels
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License
@@ -25,7 +25,7 @@ License: MIT License
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
         
-Project-URL: Homepage, https://github.com/fluid40/aas-http-client
+Project-URL: Homepage, https://github.com/fluid40/aas-standard-parser
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typing>=3.7.4.3
@@ -38,7 +38,7 @@ Dynamic: license-file
 <!-- change this to your projects logo if you have on.
   If you don't have one it might be worth trying chatgpt dall-e to create one for you...
  -->
-<img src="docs/assets/fluid_logo.svg" alt="aas_http_client" width=500 />
+<img src="docs/assets/fluid_logo.svg" alt="aas_standard_parser" width=500 />
 </div>
 
 ---

{aas_standard_parser-0.2.8.dist-info → aas_standard_parser-0.3.1.dist-info}/RECORD

@@ -4,15 +4,15 @@ aas_standard_parser/aid_parser.py,sha256=9vp8_kJRfExTmw8tjmO32n1eHFAE5ItmfPlZ2OR
 aas_standard_parser/aimc_parser.py,sha256=3GSM-jBj-9OqNDnL7CssqogNOZEd7_fjRtxwzRZi-iA,9972
 aas_standard_parser/collection_helpers.py,sha256=fTQGQiC-bGD41Qx0FDDBtWhvkeZtEe6Sh-aT93ePwro,4153
 aas_standard_parser/reference_helpers.py,sha256=HJMK1FjoEkPipw9kcT7k75EYioHz_SwcLLqXdFo9Eew,1339
-aas_standard_parser/submodel_json_parser.py,sha256=Sab5d4xJyKp80inAaNg71mTSLSGbfEl-KJ6wI0zOoQg,1237
+aas_standard_parser/submodel_json_parser.py,sha256=SeRJ-Oelrx1ZXW0W5rKVBLM_ade48yssBelVIZrGJLA,1240
 aas_standard_parser/submodel_parser.py,sha256=cKDKUBoKMJb1q6ISalJhLlE1VRqqFHTDWsv6BdeSmXU,2653
-aas_standard_parser/utils.py,sha256=TSOvTZxhPp4s63rn-xzLQasDxEiHyk6BcHhIkzaUTek,905
+aas_standard_parser/utils.py,sha256=aupcb_VfgLy8kGRReMXpEk_LS67rNwCVCW7BMFdgnv8,1608
 aas_standard_parser/version_check.py,sha256=P1nb2WvVVU5RaQ4mWViFLnF9QkUv61Zc2EApYPGiiC8,1058
 aas_standard_parser/classes/aimc_parser_classes.py,sha256=PwKpuyB36urFc8YqQ6KtrG8H5WLd-3R2c3yST8Yyc_w,2581
 aas_standard_parser/demo/demo_process.py,sha256=Xn9uD0xLoNx0ZvB3Lk0oYkGBRHaEfUbfqv5_SpPWYck,530
 aas_standard_parser/demo/logging_handler.py,sha256=x-eX4XDU3sZTJE22rzJSiaWQ8wRMbtaFpFBAeAcbIzI,5752
-aas_standard_parser-0.2.8.dist-info/licenses/LICENSE,sha256=simqYMD2P9Ikm0Kh9n7VGNpaVcm2TMVVQmECYZ_xVZ8,1065
-aas_standard_parser-0.2.8.dist-info/METADATA,sha256=iYZ1gBaUPbyY_nCzfDQxeo9LGeLycKaaL1vDw2FoH7A,4502
-aas_standard_parser-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_standard_parser-0.2.8.dist-info/top_level.txt,sha256=OQaK6cwYttR1-eKTz5u4M0jbwSfp4HqJ56chaf0nHnw,20
-aas_standard_parser-0.2.8.dist-info/RECORD,,
+aas_standard_parser-0.3.1.dist-info/licenses/LICENSE,sha256=simqYMD2P9Ikm0Kh9n7VGNpaVcm2TMVVQmECYZ_xVZ8,1065
+aas_standard_parser-0.3.1.dist-info/METADATA,sha256=MDqFHZtMLJdWAaI8KsbIesRLfYqqKmEAVGRI1rBMqm4,4510
+aas_standard_parser-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_standard_parser-0.3.1.dist-info/top_level.txt,sha256=OQaK6cwYttR1-eKTz5u4M0jbwSfp4HqJ56chaf0nHnw,20
+aas_standard_parser-0.3.1.dist-info/RECORD,,