refactor: handle error result in get_entity_from_uri

owl2yams/ccplugin.py

@@ -48,7 +48,14 @@
         try:
             return cnx.execute(rql_query, {"uri": entity_uri}).one()
         except NoResultError:
-            print("warn: no cubicweb entity for ", entity_uri)
+            print("warn: no cubicweb entity for ", entity_uri, " skipping addition")
+            return None
+        except MultipleResultsError:
+            print(
+                "warn: multiple cubicweb entities for ",
+                entity_uri,
+                " skipping addition",
+            )
             return None
 
     def get_schema_as_dict(self, repo):
@@ -87,18 +94,8 @@
                 temp_labels = []
 
                 # Get entity type from equivalent_uri
-                try:
-                    entity_type = self.get_entity_from_uri(cnx, class_uri, "CWEType")
-                except NoResultError:
-                    print(
-                        f"Did not import {instance_uri} as {class_uri} is unknown in the schema."
-                    )
-                    continue
-                except MultipleResultsError:
-                    print(
-                        f"Did not import {instance_uri} as {class_uri} because"
-                        " multiple types are possible."
-                    )
+                entity_type = self.get_entity_from_uri(cnx, class_uri, "CWEType")
+                if entity_type is None:
                     continue
 
                 # Get entity attribute
@@ -108,6 +105,8 @@
                     external_uri = cnx.create_entity("ExternalUri", uri=instance_uri)
                 temp_attributes = {"equivalent_uri": external_uri}
                 for predicate_uri, object_value in g.predicate_objects(instance_uri):
+                    if predicate_uri == RDF.type:
+                        continue
                     relation_type = None
                     try:
                         relation_type = self.get_entity_from_uri(