brought back code removed by mistake

Author: alkidbaci

owlapy/owl_ontology.py

@@ -39,7 +39,7 @@
     OWLDisjointDataPropertiesAxiom, OWLDisjointObjectPropertiesAxiom, OWLEquivalentDataPropertiesAxiom, \
     OWLEquivalentObjectPropertiesAxiom, OWLInverseObjectPropertiesAxiom, OWLNaryPropertyAxiom, OWLNaryIndividualAxiom, \
     OWLDifferentIndividualsAxiom, OWLDisjointClassesAxiom, OWLSameIndividualAxiom, OWLClassAxiom, \
-    OWLDataPropertyDomainAxiom, OWLDataPropertyRangeAxiom, OWLObjectPropertyDomainAxiom
+    OWLDataPropertyDomainAxiom, OWLDataPropertyRangeAxiom, OWLObjectPropertyDomainAxiom, OWLSubPropertyChainAxiom
 from owlapy.static_funcs import startJVM
 from owlapy.vocab import OWLFacet
 import os
@@ -510,6 +510,27 @@ def _(axiom: OWLObjectPropertyCharacteristicAxiom, ontology: AbstractOWLOntology
             raise ValueError(f'ObjectPropertyCharacteristicAxiom ({axiom}) is not defined.')
 
 
+@_add_axiom.register
+def _(axiom: OWLSubPropertyChainAxiom, ontology: AbstractOWLOntology, world: owlready2.namespace.World):
+    conv = ToOwlready2(world)
+    ont_x: owlready2.Ontology = conv.map_object(ontology)
+
+    super_property = axiom.get_super_property()
+    property_chain = list(axiom.get_property_chain())
+
+    # Ensure all properties in the chain and the super property are declared
+    _add_axiom(OWLDeclarationAxiom(super_property), ontology, world)
+    for prop in property_chain:
+        if isinstance(prop, OWLObjectInverseOf):
+            _add_axiom(OWLDeclarationAxiom(prop.get_named_property()), ontology, world)
+        else:
+            _add_axiom(OWLDeclarationAxiom(prop), ontology, world)
+
+    with ont_x:
+        super_property_x = conv._to_owlready2_property(super_property)
+        property_chain_x = [conv._to_owlready2_property(prop) for prop in property_chain]
+        super_property_x.property_chain.append(owlready2.PropertyChain(property_chain_x))
+
 @_add_axiom.register
 def _(axiom: OWLDataPropertyCharacteristicAxiom, ontology: AbstractOWLOntology, world: owlready2.namespace.World):
     conv = ToOwlready2(world)
@@ -820,6 +841,28 @@ def _(axiom: OWLDataPropertyCharacteristicAxiom, ontology: AbstractOWLOntology,
                 and owlready2.FunctionalProperty in property_x.is_a:
             property_x.is_a.remove(owlready2.FunctionalProperty)
 
+@_remove_axiom.register
+def _(axiom: OWLSubPropertyChainAxiom, ontology: AbstractOWLOntology, world: owlready2.namespace.World):
+    conv = ToOwlready2(world)
+    ont_x: owlready2.Ontology = conv.map_object(ontology)
+
+    super_property = axiom.get_super_property()
+    property_chain = list(axiom.get_property_chain())
+
+    with ont_x:
+        super_property_x = conv._to_owlready2_property(super_property)
+        if super_property_x is None:
+            return
+
+        property_chain_x = [conv._to_owlready2_property(prop) for prop in property_chain]
+        if not all(property_chain_x):
+            return
+
+        # Find and remove the matching property chain
+        for pc in super_property_x.property_chain:
+            if list(pc.properties) == property_chain_x:
+                super_property_x.property_chain.remove(pc)
+                break
 
 class Ontology(AbstractOWLOntology):
     __slots__ = '_iri', '_world', '_onto', 'is_modified'
@@ -2137,6 +2180,36 @@ def predict(self, h: List[str] = None, r: List[str] = None, t: List[str] = None)
         else:
             topk = len(self.model.entity_to_idx)
 
+        # Filter out unknown relations; return empty list (0 scores) if none remain
+        if r is not None:
+            if isinstance(r, str):
+                if r not in self.model.relation_to_idx:
+                    return []
+            else:
+                r = [ri for ri in r if ri in self.model.relation_to_idx]
+                if not r:
+                    return []
+
+        # Filter out unknown head entities; return empty list (0 scores) if none remain
+        if h is not None:
+            if isinstance(h, str):
+                if h not in self.model.entity_to_idx:
+                    return []
+            else:
+                h = [hi for hi in h if hi in self.model.entity_to_idx]
+                if not h:
+                    return []
+
+        # Filter out unknown tail entities; return empty list (0 scores) if none remain
+        if t is not None:
+            if isinstance(t, str):
+                if t not in self.model.entity_to_idx:
+                    return []
+            else:
+                t = [ti for ti in t if ti in self.model.entity_to_idx]
+                if not t:
+                    return []
+
         return [(top_entity, score) for row in
                 self.model.predict_topk(h=h, r=r, t=t, topk=topk, batch_size=self.batch_size) for top_entity, score in
                 row if score >= self.gamma and is_valid_entity(top_entity)]