naas-abi-core 1.5.0__py3-none-any.whl → 1.6.0__py3-none-any.whl

naas_abi_core/module/Module.py

@@ -70,6 +70,7 @@ class BaseModule(Generic[TConfig]):
             "configuration must be an instance of ModuleConfiguration"
         )
         logger.debug(f"Initializing module {self.__module__.split('.')[0]}")
+        self.module_path = self.__module__.split(".")[0]
         self._engine = engine
         self._configuration = configuration
 

naas_abi_core/utils/onto2py/onto2py.py

@@ -349,6 +349,7 @@ def generate_python_code(classes: Dict[str, ClassInfo],
         "    \"\"\"Base class for all RDF entities with URI and namespace management\"\"\"",
         "    _namespace: ClassVar[str] = \"http://example.org/instance/\"",
         "    _uri: str = \"\"",
+        "    _object_properties: ClassVar[set[str]] = set()",
         "    ",
         "    model_config = {",
         "        'arbitrary_types_allowed': True,",
@@ -381,9 +382,12 @@ def generate_python_code(classes: Dict[str, ClassInfo],
         "        if hasattr(self, '_class_uri'):",
         "            g.add((subject, RDF.type, URIRef(self._class_uri)))",
         "        ",
+        "        object_props = getattr(self, '_object_properties', set())",
+        "        ",
         "        # Add properties",
         "        if hasattr(self, '_property_uris'):",
         "            for prop_name, prop_uri in self._property_uris.items():",
+        "                is_object_prop = prop_name in object_props",
         "                prop_value = getattr(self, prop_name, None)",
         "                if prop_value is not None:",
         "                    if isinstance(prop_value, list):",
@@ -392,12 +396,16 @@ def generate_python_code(classes: Dict[str, ClassInfo],
         "                                # Add triples from related object",
         "                                g += item.rdf()",
         "                                g.add((subject, URIRef(prop_uri), URIRef(item._uri)))",
+        "                            elif is_object_prop and isinstance(item, (str, URIRef)):",
+        "                                g.add((subject, URIRef(prop_uri), URIRef(str(item))))",
         "                            else:",
         "                                g.add((subject, URIRef(prop_uri), Literal(item)))",
         "                    elif hasattr(prop_value, 'rdf'):",
         "                        # Add triples from related object",
         "                        g += prop_value.rdf()",
         "                        g.add((subject, URIRef(prop_uri), URIRef(prop_value._uri)))",
+        "                    elif is_object_prop and isinstance(prop_value, (str, URIRef)):",
+        "                        g.add((subject, URIRef(prop_uri), URIRef(str(prop_value))))",
         "                    else:",
         "                        g.add((subject, URIRef(prop_uri), Literal(prop_value)))",
         "        ",
@@ -541,8 +549,16 @@ def generate_class_code(class_info: ClassInfo) -> List[str]:
     else:
         lines.append("    _property_uris: ClassVar[dict] = {}")
 
-    if class_info.property_uris:
-        lines.append("")
+    object_prop_names = sorted(
+        {prop.name for prop in properties_list if prop.property_type == "object"}
+    )
+    if object_prop_names:
+        names = ", ".join(f"'{name}'" for name in object_prop_names)
+        lines.append(f"    _object_properties: ClassVar[set[str]] = {{{names}}}")
+    else:
+        lines.append("    _object_properties: ClassVar[set[str]] = set()")
+
+    lines.append("")
 
     # Add properties grouped by type for readability
     data_properties = sorted(
@@ -592,10 +608,11 @@ def generate_property_code(prop: PropertyInfo) -> str:
     # Determine type annotation and Pydantic Field
     if prop.property_type == 'object' and prop.range_class:
         if prop.cardinality == 'multiple':
-            type_annotation = f"List[{prop.range_class}]"
+            type_annotation = f"List[Union[str, {prop.range_class}]]"
             default_value = "Field(default_factory=list)"
         else:
-            type_annotation = f"Optional[{prop.range_class}]" if not prop.required else prop.range_class
+            inner = f"Union[str, {prop.range_class}]"
+            type_annotation = f"Optional[{inner}]" if not prop.required else inner
             default_value = "Field(default=None)" if not prop.required else "Field(...)"
     elif prop.property_type == 'data' and prop.datatype:
         if prop.cardinality == 'multiple':

{naas_abi_core-1.5.0.dist-info → naas_abi_core-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.5.0
+Version: 1.6.0
 Summary: Abi framework allowing you to build your AI system.
 Project-URL: Homepage, https://github.com/jupyter-naas/abi
 Project-URL: Repository, https://github.com/jupyter-naas/abi/tree/main/libs/naas-abi-core

{naas_abi_core-1.5.0.dist-info → naas_abi_core-1.6.0.dist-info}/RECORD

@@ -33,7 +33,7 @@ naas_abi_core/integration/integration.py,sha256=tbdAV63Uisml9G8diZl20_JDlgJVFuLQ
 naas_abi_core/models/Model.py,sha256=s1Aj8Mcy113uhgYR4-lSfoyLnucOzOlnxKu6QKSwfeY,8223
 naas_abi_core/models/OpenRouter.py,sha256=BqDRnBlDmTdhE5cv7VsZ1IiZVad_lIltnnGt4V6MRuw,492
 naas_abi_core/models/OpenRouter_test.py,sha256=nLlVdBaBan0mkdbnF3vrWGJYr8zQAC7Fl3wLUc37Mvw,1168
-naas_abi_core/module/Module.py,sha256=UGNXZkwgD0xv7HrxTHH9eRXYPv8kuxqfMGAHgfgQJlM,9096
+naas_abi_core/module/Module.py,sha256=fyZBU0rUwWuPR3LGjUm5v6eWNXrCWvv_QDkWVu9n_yE,9153
 naas_abi_core/module/ModuleAgentLoader.py,sha256=9FXcK8h0_0h4hU3gEjImUbNBBeYJ9HOEjYqKVdTl3ik,2050
 naas_abi_core/module/ModuleUtils.py,sha256=6wUHpbdl0y_16xvz7W-NSOaRyLW9N9zx2Lg_Jkg0eMM,707
 naas_abi_core/modules/templatablesparqlquery/README.md,sha256=Cpz3FPMc1q-P5HmQ7848er5_MRTHLDLqYqq0nFrs7Dw,6991
@@ -112,13 +112,13 @@ naas_abi_core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 naas_abi_core/utils/onto2py/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naas_abi_core/utils/onto2py/__init__.py,sha256=mhTtX2gCv-IyWG71hiCYiOEbGOuDTssaOcqXxqySxn0,163
 naas_abi_core/utils/onto2py/__main__.py,sha256=b-brUMSGdg972Cr06V6BVIdSMTw17--h7b9zE3UPZ4E,696
-naas_abi_core/utils/onto2py/onto2py.py,sha256=_wn9qrrsWd8gO-BY4_jQJVfY87e9MJ2Er2Rf4FXcNls,24095
+naas_abi_core/utils/onto2py/onto2py.py,sha256=omwUG0jFnk2ZQi5j1YHBQ4zvV38CH75U9DFWlVIrNiU,25096
 naas_abi_core/utils/onto2py/tests/ttl2py_test.py,sha256=5OZqSxPffjJYiX9T4rT1mV0PT1Qhf6goqEYT_mAPnaI,8055
 naas_abi_core/workflow/__init__.py,sha256=hZD58mCB1PApxITqftP_xgjxL7NeLvOfI-rJENg1ENs,250
 naas_abi_core/workflow/workflow.py,sha256=ZufSS073JztVl0OQRTqNyK7FepFvv7gXlc4j5FAEZCI,1216
 assets/favicon.ico,sha256=nWk8wrHZiJV3DeuWrP2MqilXxCuoNWKGtMZfYmEVQLw,666
 assets/logo.png,sha256=zUu9sNgMmtzJhfNCinDs85GP1LDNVfTy8kYLKRT_pxA,9334
-naas_abi_core-1.5.0.dist-info/METADATA,sha256=u--jb15TQ-2SKQ8UOo1sf0EX8qZJBP2StgZ67XuqCSA,17567
-naas_abi_core-1.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naas_abi_core-1.5.0.dist-info/entry_points.txt,sha256=IX0WUFxZuo1JU6H66fcRR6y7gYChMVw_XA9suPk9_1Q,70
-naas_abi_core-1.5.0.dist-info/RECORD,,
+naas_abi_core-1.6.0.dist-info/METADATA,sha256=z_T4toUv563_v5rB_oNEKuTBv_yp08Tt1i3N1gr5uxk,17567
+naas_abi_core-1.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_core-1.6.0.dist-info/entry_points.txt,sha256=IX0WUFxZuo1JU6H66fcRR6y7gYChMVw_XA9suPk9_1Q,70
+naas_abi_core-1.6.0.dist-info/RECORD,,