mdtpy 0.2.3__tar.gz → 0.2.4__tar.gz

{mdtpy-0.2.3 → mdtpy-0.2.4}/PKG-INFO

@@ -1,7 +1,15 @@
 Metadata-Version: 2.4
 Name: mdtpy
-Version: 0.2.3
-Summary: MDTPlatform을 python 언어를 통해 활용할 수 있는 라이브러리를 제공한다.
+Version: 0.2.4
+Summary: A Python client library for the MDT (Manufacturing Digital Twin) Platform.
+Author-email: Kang-Woo Lee <kwlee@etri.re.kr>
+Keywords: MDT,AAS,digital-twin,manufacturing,basyx
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: basyx-python-sdk<3.0.0,>=2.0.0
@@ -10,7 +18,6 @@ Requires-Dist: isodate>=0.7.2
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: pandas>=2.3.3
 Requires-Dist: requests>=2.32.5
-Requires-Dist: tika>=3.1.0
 Requires-Dist: typing_extensions>=4.2.0
 Requires-Dist: urllib3<3.0.0,>=2.6.2
 

{mdtpy-0.2.3 → mdtpy-0.2.4}/pyproject.toml

@@ -4,10 +4,20 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mdtpy"
-version = "0.2.3"
-description = "MDTPlatform을 python 언어를 통해 활용할 수 있는 라이브러리를 제공한다."
+version = "0.2.4"
+description = "A Python client library for the MDT (Manufacturing Digital Twin) Platform."
 readme = "README.md"
 requires-python = ">=3.10"
+authors = [{ name = "Kang-Woo Lee", email = "kwlee@etri.re.kr" }]
+keywords = ["MDT", "AAS", "digital-twin", "manufacturing", "basyx"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Operating System :: OS Independent",
+    "Topic :: Scientific/Engineering",
+]
 dependencies = [
     "basyx-python-sdk>=2.0.0,<3.0.0",
     "dataclass-wizard>=0.22,<1",
@@ -15,7 +25,6 @@ dependencies = [
     "jinja2>=3.1.6",
     "pandas>=2.3.3",
     "requests>=2.32.5",
-    "tika>=3.1.0",
     "typing_extensions>=4.2.0",
     "urllib3>=2.6.2,<3.0.0",
 ]

{mdtpy-0.2.3 → mdtpy-0.2.4}/src/mdtpy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.3"
+__version__ = "0.2.4"
 
 # SSL 인증서 검증 경고 억제
 import urllib3

{mdtpy-0.2.3 → mdtpy-0.2.4}/src/mdtpy/airflow/invocation.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
 from typing import Optional, TypedDict
 from typing_extensions import NotRequired
 
 from abc import ABC, abstractmethod
 
+import logging
+logger = logging.getLogger(__name__)
+
 from ..reference import ElementReference
 from ..operation import OperationSubmodelService
 from .argument_spec import ElementReferenceArgumentSpec, LiteralArgumentSpec, TaskOutputArgumentSpec
@@ -58,6 +60,7 @@ class AASOperationTaskInvocation(Invocation):
     self.argument_specs = argument_specs
 
   def run(self, context:Optional[DagContext]=None) -> None:
+    logger.info(f"Invoking operation {self.instance}:{self.submodel} with arguments {self.argument_specs}")
     if context is None:
       context = AirflowDagContext()
 
@@ -75,21 +78,3 @@ class AASOperationTaskInvocation(Invocation):
     return ( f"{self.__class__.__name__}(task={self.instance}:{self.submodel}, "
              f"inputs={self.argument_specs['inputs']}, "
              f"outputs={get_output_argument_specs(self.argument_specs)})" )
-
-
-# def add_task_output_values(context:DagContext, out_arg_values:ElementValueDict,
-#                           out_arg_specs_dict:dict[str, OutputArgumentSpecType]) -> None:
-#   task_id = context.task_id
-#   for arg_id, arg_value in out_arg_values.items():
-#     if arg_id not in out_arg_specs_dict:
-#       continue
-
-#     out_arg_specs = out_arg_specs_dict[arg_id]
-#     if isinstance(out_arg_specs, list):
-#       for arg_spec in out_arg_specs:
-#         if isinstance(arg_spec, OutputArgumentSpec):
-#           context.add_task_output_value(task_id, arg_id, arg_value)
-#           break
-#     else:
-#       if isinstance(out_arg_specs, OutputArgumentSpec):
-#           context.add_task_output_value(task_id, arg_id, arg_value)

{mdtpy-0.2.3 → mdtpy-0.2.4}/src/mdtpy/value.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import mimetypes
 from typing import TYPE_CHECKING, Union, Optional, TypedDict, cast
 from collections.abc import Mapping
 
@@ -120,20 +121,20 @@ def to_file_value(path: str, content_type: Optional[str] = None) -> FileValue:
     """
     파일 경로로부터 `FileValue` TypedDict를 만든다.
 
-    `content_type`이 주어지지 않으면 Tika가 파일을 읽어 MIME type을
-    추정한다 (Tika 서버 또는 로컬 모드 의존).
+    `content_type`이 주어지지 않으면 파일명(확장자)으로부터 MIME type을
+    추정한다 (`mimetypes.guess_type`). 확장자로 판별되지 않으면
+    `application/octet-stream`을 사용한다.
 
     Args:
         path (str): 파일 경로.
         content_type (Optional[str]): 명시적 MIME type.
-            None이면 Tika로 자동 추정.
+            None이면 파일명(확장자)으로 자동 추정.
     Returns:
         FileValue: `{'content_type': str, 'value': <파일명>}`.
     """
     if content_type is None:
-        from tika import parser
-        parsed = parser.from_file(path)
-        mime_type = parsed["metadata"]["Content-Type"]  # type: ignore
+        guessed, _ = mimetypes.guess_type(path)
+        mime_type = guessed or "application/octet-stream"
     else:
         mime_type = content_type
     return {'content_type': mime_type, 'value': Path(path).name}

{mdtpy-0.2.3 → mdtpy-0.2.4}/src/mdtpy.egg-info/PKG-INFO

@@ -1,7 +1,15 @@
 Metadata-Version: 2.4
 Name: mdtpy
-Version: 0.2.3
-Summary: MDTPlatform을 python 언어를 통해 활용할 수 있는 라이브러리를 제공한다.
+Version: 0.2.4
+Summary: A Python client library for the MDT (Manufacturing Digital Twin) Platform.
+Author-email: Kang-Woo Lee <kwlee@etri.re.kr>
+Keywords: MDT,AAS,digital-twin,manufacturing,basyx
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: basyx-python-sdk<3.0.0,>=2.0.0
@@ -10,7 +18,6 @@ Requires-Dist: isodate>=0.7.2
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: pandas>=2.3.3
 Requires-Dist: requests>=2.32.5
-Requires-Dist: tika>=3.1.0
 Requires-Dist: typing_extensions>=4.2.0
 Requires-Dist: urllib3<3.0.0,>=2.6.2
 

{mdtpy-0.2.3 → mdtpy-0.2.4}/src/mdtpy.egg-info/requires.txt

@@ -4,6 +4,5 @@ isodate>=0.7.2
 jinja2>=3.1.6
 pandas>=2.3.3
 requests>=2.32.5
-tika>=3.1.0
 typing_extensions>=4.2.0
 urllib3<3.0.0,>=2.6.2

mdtpy-0.2.4/src/samples/sample_instance.py

@@ -0,0 +1,40 @@
+import mdtpy
+from mdtpy.descriptor import MDTInstanceStatus
+from mdtpy import InvalidResourceStateError
+
+manager = mdtpy.connect("http://localhost:12985/instance-manager")
+
+# for inst in manager.instances:
+#   print(f"Instance: {inst.id}")
+#   print(f"  Status: {inst.status}")
+#   print(f"  AAS_ID: {inst.aas_id}")
+#   print(f"  ServiceUrl: {inst.base_endpoint}")
+
+# for inst in manager.instances:
+#   try:
+#     inst.start()
+#     print(f"Started instance {inst.id}")
+#   except InvalidResourceStateError as e:
+#     assert (inst.status == MDTInstanceStatus.RUNNING
+#             or inst.status == MDTInstanceStatus.FAILED)
+#     print(f"Instance {inst.id} is already running.")
+
+for inst in manager.instances.find("instance_id = 'HEAT-01'"):
+    print(f"Instance: {inst.id}")
+
+
+condition = f"parameter.id='CurrentLotNo'"
+for inst in manager.instances.find(condition):
+    print(f"Instance {inst.id}")
+print("----")
+
+condition = f"parameter.id='FurnaceRecipe'"
+for inst in manager.instances.find(condition):
+    print(f"Instance {inst.id}")
+print("----")
+
+condition = f"parameter.id='CurrentLotNo'"
+for inst in manager.instances.find(condition):
+    value = inst.parameters["CurrentLotNo"].read_value()
+    print(f"Instance {inst.id} has CurrentLotNo={value}")
+print("----")

mdtpy-0.2.3/src/samples/sample_instance.py

@@ -1,20 +0,0 @@
-import mdtpy
-from mdtpy.descriptor import MDTInstanceStatus
-from mdtpy import InvalidResourceStateError
-
-manager = mdtpy.connect("http://localhost:12985/instance-manager")
-
-for inst in manager.instances:
-  print(f"Instance: {inst.id}")
-  print(f"  Status: {inst.status}")
-  print(f"  AAS_ID: {inst.aas_id}")
-  print(f"  ServiceUrl: {inst.base_endpoint}")
-
-for inst in manager.instances:
-  try:
-    inst.start()
-    print(f"Started instance {inst.id}")
-  except InvalidResourceStateError as e:
-    assert (inst.status == MDTInstanceStatus.RUNNING
-            or inst.status == MDTInstanceStatus.FAILED)
-    print(f"Instance {inst.id} is already running.")