aas-standard-parser 0.2.9__tar.gz → 0.3.2__tar.gz

{aas_standard_parser-0.2.9 → aas_standard_parser-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-standard-parser
-Version: 0.2.9
+Version: 0.3.2
 Summary: Some auxiliary functions for parsing standard submodels
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License
@@ -25,11 +25,13 @@ 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
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing>=3.7.4.3
-Requires-Dist: basyx-python-sdk>=1.2.1
+Requires-Dist: basyx-python-sdk>=2.0.0
+Requires-Dist: python-json-logger>=4.0.0
+Requires-Dist: requests>=2.32.5
 Dynamic: license-file
 
 # aas-standard-parser
@@ -38,7 +40,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.9 → aas_standard_parser-0.3.2}/README.md

@@ -4,7 +4,7 @@
 <!-- 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.9 → aas_standard_parser-0.3.2}/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.9 → aas_standard_parser-0.3.2}/aas_standard_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-standard-parser
-Version: 0.2.9
+Version: 0.3.2
 Summary: Some auxiliary functions for parsing standard submodels
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License
@@ -25,11 +25,13 @@ 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
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing>=3.7.4.3
-Requires-Dist: basyx-python-sdk>=1.2.1
+Requires-Dist: basyx-python-sdk>=2.0.0
+Requires-Dist: python-json-logger>=4.0.0
+Requires-Dist: requests>=2.32.5
 Dynamic: license-file
 
 # aas-standard-parser
@@ -38,7 +40,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.3.2/aas_standard_parser.egg-info/requires.txt

@@ -0,0 +1,3 @@
+basyx-python-sdk>=2.0.0
+python-json-logger>=4.0.0
+requests>=2.32.5

{aas_standard_parser-0.2.9 → aas_standard_parser-0.3.2}/pyproject.toml

@@ -4,14 +4,19 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aas-standard-parser"
-version = "0.2.9"
+version = "0.3.2"
 description = "Some auxiliary functions for parsing standard submodels"
 readme = "README.md"
 license = { file = "LICENSE" }
 authors = [{ name = "Daniel Klein", email = "daniel.klein@em.ag" }]
-dependencies = ["typing>=3.7.4.3", "basyx-python-sdk>=1.2.1"]
+requires-python = ">=3.11"
+dependencies = [
+    "basyx-python-sdk>=2.0.0",
+    "python-json-logger>=4.0.0",
+    "requests>=2.32.5",
+]
 [project.urls]
-Homepage = "https://github.com/fluid40/aas-http-client"
+Homepage = "https://github.com/fluid40/aas-standard-parser"
 
 [tool.commitizen]
 name = "cz_conventional_commits"

aas_standard_parser-0.2.9/aas_standard_parser.egg-info/requires.txt

@@ -1,2 +0,0 @@
-typing>=3.7.4.3
-basyx-python-sdk>=1.2.1