aas-http-client 0.3.8__py3-none-any.whl → 0.4.0__py3-none-any.whl

aas_http_client/__init__.py

@@ -1,22 +1,31 @@
-from datetime import datetime
 import importlib.metadata
+from datetime import datetime, timezone
 
-__copyright__ = f"Copyright (C) {datetime.now().year} :em engineering methods AG. All rights reserved."
+__copyright__ = f"Copyright (C) {datetime.now(tz=timezone.utc).year} :em engineering methods AG. All rights reserved."
 __author__ = "Daniel Klein"
 
 try:
     __version__ = importlib.metadata.version(__name__)
 except importlib.metadata.PackageNotFoundError:
     __version__ = "0.0.0-dev"
-    
+
 __project__ = "aas-http-client"
 __package__ = "aas-http-client"
 
+from aas_http_client.client import AasHttpClient, create_client_by_config, create_client_by_url
 from aas_http_client.core.version_check import check_for_update
-from aas_http_client.client import create_client_by_config, create_client_by_url, AasHttpClient
-from aas_http_client.utilities import model_builder
-from aas_http_client.wrapper.sdk_wrapper import create_wrapper_by_config, create_wrapper_by_url, SdkWrapper
+from aas_http_client.utilities import model_builder, sdk_tools
+from aas_http_client.wrapper.sdk_wrapper import SdkWrapper, create_wrapper_by_config, create_wrapper_by_url
 
 check_for_update()
 
-__all__ = ["create_client_by_config", "create_client_by_url", "AasHttpClient", "model_builder", "create_wrapper_by_config", "create_wrapper_by_url", "SdkWrapper"]
+__all__ = [
+    "create_client_by_config",
+    "create_client_by_url",
+    "AasHttpClient",
+    "model_builder",
+    "create_wrapper_by_config",
+    "create_wrapper_by_url",
+    "SdkWrapper",
+    "sdk_tools",
+]

aas_http_client/utilities/model_builder.py

@@ -39,17 +39,15 @@ def create_base_submodel_element_property(
     return sme
 
 
-def create_base_submodel(id_short: str, namespace: str = "fluid40", display_name: str = "", description: str = "") -> model.Submodel:
+def create_base_submodel(identifier: str, id_short: str, display_name: str = "", description: str = "") -> model.Submodel:
     """Create a basic Submodel.
 
+    :param identifier: identifier of the Submodel
     :param id_short: ID short of the Submodel
-    :param namespace: namespace of the Submodel , defaults to "fluid40"
     :param display_name: display name of the Submodel, defaults to ""
     :param description: description of the Submodel, defaults to ""
     :return: Submodel instance
     """
-    identifier = f"{namespace}/{id_short}" if namespace else id_short
-
     sm = model.Submodel(identifier)
     sm.id_short = id_short
 
@@ -68,16 +66,16 @@ def create_base_submodel(id_short: str, namespace: str = "fluid40", display_name
     return sm
 
 
-def create_base_ass(id_short: str, namespace: str = "fluid40", display_name: str = "", description: str = "") -> model.AssetAdministrationShell:
+def create_base_ass(identifier: str, id_short: str, display_name: str = "", description: str = "") -> model.AssetAdministrationShell:
     """Create a basic AAS.
 
+    :param identifier: identifier of the AAS
     :param id_short: ID short of the AAS
-    :param namespace: namespace of the AAS, defaults to "basyx_python_aas_server"
     :param display_name: display name of the AAS, defaults to ""
     :param description: description of the AAS, defaults to ""
     :return: AssetAdministrationShell instance
     """
-    asset_info = create_base_asset_information(id_short, namespace)
+    asset_info = create_base_asset_information(identifier)
 
     aas = model.AssetAdministrationShell(id_=asset_info.global_asset_id, asset_information=asset_info)
     aas.id_short = id_short
@@ -97,14 +95,13 @@ def create_base_ass(id_short: str, namespace: str = "fluid40", display_name: str
     return aas
 
 
-def create_base_asset_information(id_short: str, namespace: str = "basyx_python_aas_server") -> model.AssetInformation:
+def create_base_asset_information(identifier: str) -> model.AssetInformation:
     """Return a basic AssetInformation instance.
 
     :param id_short: short ID of the AssetInformation
     :param namespace: namespace of the AssetInformation, defaults to "basyx_python_aas_server"
     :return: AssetInformation instance
     """
-    identifier = f"{namespace}/{id_short}" if namespace else id_short
     return model.AssetInformation(model.AssetKind.INSTANCE, identifier)
 
 

{aas_http_client-0.3.8.dist-info → aas_http_client-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.8
+Version: 0.4.0
 Summary: Generic python HTTP client for communication 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.3.8.dist-info → aas_http_client-0.4.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-aas_http_client/__init__.py,sha256=cAr1mQzWp0G0LKtkAOYzc9t95OY3jM3Aj4bKnxx0Dso,901
+aas_http_client/__init__.py,sha256=bBfrdXUHvukisXIj0CcnNUHUw8_7nrdnfQRve8nM_3U,982
 aas_http_client/client.py,sha256=CtX1nlIo65-Um9AlXZ3gOfEMJwcLDJNOssxkGXAlsg0,27205
 aas_http_client/core/encoder.py,sha256=FS7P0FPakzFsGz70eRFDHQZFA_2nlKLlWIxavtnFrPg,660
 aas_http_client/core/version_check.py,sha256=9dR0Q6jCFygH_ctj4vyrjerpHvolT87ayengZFlBWCw,708
 aas_http_client/demo/demo_process.py,sha256=s60SBx0le1G2BU_uJ8vC5i6zTcSGQprSnYafZPUtOtE,3299
 aas_http_client/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aas_http_client/utilities/model_builder.py,sha256=HXeuSyy2SFoeETXhceB0Xcs4z2RmEPuaTzww4q2MANg,4055
+aas_http_client/utilities/model_builder.py,sha256=6pZ0mcfofkuCu24wp71vhBKyaLXJcHpU8N4PBHx_Xpo,3782
 aas_http_client/utilities/sdk_tools.py,sha256=QPpItZdhw8y13IgpS015vTAb8e8QfPeidUuE6-K0JIo,1637
 aas_http_client/wrapper/sdk_wrapper.py,sha256=67RiQ5qAgFq84817QurGX-GJBsM3QI3k4-uBC7sOQio,14807
-aas_http_client-0.3.8.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
-aas_http_client-0.3.8.dist-info/METADATA,sha256=RHWq5wMyKXpqJCxcs2qMET7VdzEPP5XOpmlg6-nY7tQ,10467
-aas_http_client-0.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_http_client-0.3.8.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
-aas_http_client-0.3.8.dist-info/RECORD,,
+aas_http_client-0.4.0.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
+aas_http_client-0.4.0.dist-info/METADATA,sha256=o5uysJOtlvq_E-ALEMnnw0oEAbfHXYqGOhT2xpRKmVc,10467
+aas_http_client-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_http_client-0.4.0.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
+aas_http_client-0.4.0.dist-info/RECORD,,