naas-abi-core 1.5.0__tar.gz → 1.5.1__tar.gz

naas_abi_core-1.5.1/=0.9.13

@@ -0,0 +1,6 @@
+Collecting uv
+  Downloading uv-0.9.26-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (11 kB)
+Downloading uv-0.9.26-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (23.3 MB)
+   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 23.3/23.3 MB 275.6 MB/s  0:00:00
+Installing collected packages: uv
+Successfully installed uv-0.9.26

{naas_abi_core-1.5.0 → naas_abi_core-1.5.1}/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 <!-- version list -->
 
+## v1.5.1 (2026-01-16)
+
+
 ## v1.5.0 (2026-01-15)
 
 

{naas_abi_core-1.5.0 → naas_abi_core-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.5.0
+Version: 1.5.1
 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 → naas_abi_core-1.5.1}/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 → naas_abi_core-1.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "naas-abi-core"
-version = "1.5.0"
+version = "1.5.1"
 description = "Abi framework allowing you to build your AI system."
 authors = [{ name = "Maxime Jublou", email = "maxime@naas.ai" },{ name = "Florent Ravenel", email = "florent@naas.ai" }, { name = "Jeremy Ravenel", email = "jeremy@naas.ai" }]
 requires-python = ">=3.10,<4"

naas_abi_core-1.5.0/=0.9.13

@@ -1,6 +0,0 @@
-Collecting uv
-  Downloading uv-0.9.25-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (11 kB)
-Downloading uv-0.9.25-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (22.3 MB)
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 22.3/22.3 MB 241.0 MB/s  0:00:00
-Installing collected packages: uv
-Successfully installed uv-0.9.25