streamlit-octostar-utils 0.1.7a9__py3-none-any.whl → 0.1.7a11__py3-none-any.whl

streamlit_octostar_utils/api_crafter/fastapi.py

@@ -314,7 +314,7 @@ class DefaultErrorRoute:
         },
     }
 
-    def format_error(exc, body=bytes(), debug=False, excs_to_status_codes=DEFAULT_STATUS_CODE_MAPPINGS):
+    def format_error(exc, body=b"", debug=False, excs_to_status_codes=DEFAULT_STATUS_CODE_MAPPINGS):
         """Generic Error Handler"""
         status_code = 500
         for exc_type, handler in excs_to_status_codes.items():
@@ -355,7 +355,7 @@ class DefaultErrorRoute:
             silenced_excs = DefaultErrorRoute.DEFAULT_SILENCED_EXCEPTIONS
 
         async def _async_handle_error(request: Request, exc: Exception):
-            return await DefaultErrorRoute.handle_error(request, exc, debug, excs_to_status_codes)
+            return await DefaultErrorRoute.handle_error(b"", exc, debug, excs_to_status_codes)
 
         # Added all three since FastAPI seems to intercept some exceptions before Exception
         fs_app.add_exception_handler(RequestValidationError, _async_handle_error)

streamlit_octostar_utils/api_crafter/parser/entities_parser.py

@@ -60,29 +60,23 @@ class EntitiesInvalidReason(Enum):
     INVALID_REL_TYPE = 20
     UNKNOWN_UUID = 21
     WRONG_SOURCE_OR_TARGET_TYPE = 22
+    
+    
+EntityDict = dict
+InvalidErrorDict = dict
 
 
 class EntitiesParser(object):
-    def __init__(self, parse_rulesets, client=None):
+    def __init__(self, parse_rulesets, ontology=None):
         self.concepts = dict()
         self.ruleset = dict()
-        self.ontology = None
-        self.os_client = client
+        self.ontology = ontology
         if not isinstance(parse_rulesets, list):
             parse_rulesets = [parse_rulesets]
         for parse_ruleset in parse_rulesets:
             self.ruleset = parse_ruleset.load(self.ruleset, self)
         self._reset_parsing_vars()
 
-    def _get_ontology(self):
-        if not self.ontology:
-            from octostar.utils.ontology import fetch_ontology_data
-
-            try:
-                self.ontology = fetch_ontology_data.sync(client=self.os_client)
-            except:
-                self.ontology = None
-
     def _reset_parsing_vars(self):
         self.curr_entries = list()
         self.curr_entities = list()
@@ -127,13 +121,13 @@ class EntitiesParser(object):
     def _cull_entities(self, entities, relationships):
         removed_ids = list()
         for entity in entities:
-            if "extra_fields" in entity.fields:
-                if not entity.fields["extra_fields"]:
-                    del entity.fields["extra_fields"]
+            if "#extra_fields" in entity.fields:
+                if not entity.fields["#extra_fields"]:
+                    del entity.fields["#extra_fields"]
                 else:
-                    for extra_field in list(entity.fields["extra_fields"].keys()):
-                        if not entity.fields["extra_fields"][extra_field]:
-                            del entity.fields["extra_fields"][extra_field]
+                    for extra_field in list(entity.fields["#extra_fields"].keys()):
+                        if not entity.fields["#extra_fields"][extra_field]:
+                            del entity.fields["#extra_fields"][extra_field]
             for field in list(entity.fields.keys()):
                 if not entity.fields[field]:
                     del entity.fields[field]
@@ -244,11 +238,11 @@ class EntitiesParser(object):
         if root_entity:
             root_entity = root_entity[0]
             unused_fields = dict()
-            if "extra_fields" not in root_entity.fields:
-                root_entity.fields["extra_fields"] = dict()
+            if "#extra_fields" not in root_entity.fields:
+                root_entity.fields["#extra_fields"] = dict()
             unused_fields = _find_extra_fields_recursive(entry.value)
-            root_entity.fields["extra_fields"] = {
-                **root_entity.fields["extra_fields"],
+            root_entity.fields["#extra_fields"] = {
+                **root_entity.fields["#extra_fields"],
                 **unused_fields,
             }
 
@@ -544,32 +538,44 @@ class EntitiesParser(object):
     """
 
     def validate_and_format_entities(self, entities, relationships):
-        self._get_ontology()
         if not self.ontology:
-            raise RuntimeError("Ontology could not be fetched for validation!")
+            raise RuntimeError("No ontology provided for validation!")
+        ontology = self.ontology
         from streamlit_octostar_utils.ontology.validation import (
             validate_and_format_timbr_type,
         )
         from streamlit_octostar_utils.ontology.inheritance import is_child_concept
 
         processed_entities = []
-        processsed_relationships = []
+        processed_relationships = []
         for entity in entities:
-            if entity.concept_name not in self.ontology["concepts"]:
-                processed_entities.append((EntitiesInvalidReason.INVALID_TYPE, entity))
-                continue
+            if entity.concept_name not in ontology["concepts"]:
+                processed_entities.append(
+                    (
+                        EntitiesInvalidReason.INVALID_TYPE,
+                        entity,
+                        {"error_message": f"{entity} has invalid concept name"},
+                    )
+                )
             entity_properties = [
-                k for k in entity.fields.keys() if not k.startswith("#")
+                k
+                for k in entity.fields.keys()
+                if not k.startswith("#")
             ]
             ontology_properties = {
                 e["property_name"]: e
-                for e in self.ontology["concepts"][entity.concept_name]["allProperties"]
+                for e in ontology["concepts"][entity.concept_name]["allProperties"]
             }
             if any(prop not in ontology_properties for prop in entity_properties):
                 processed_entities.append(
-                    (EntitiesInvalidReason.INVALID_PROPERTIES, entity)
+                    (
+                        EntitiesInvalidReason.INVALID_PROPERTIES,
+                        entity,
+                        {
+                            "error_message": f"{entity} has invalid entity properties: {str(set(entity_properties) - set(ontology_properties))}"
+                        },
+                    )
                 )
-                continue
             for prop in entity_properties:
                 try:
                     entity.fields[prop] = validate_and_format_timbr_type(
@@ -577,46 +583,66 @@ class EntitiesParser(object):
                     )
                 except:
                     processed_entities.append(
-                        (EntitiesInvalidReason.INVALID_PROPERTIES, entity)
+                        (
+                            EntitiesInvalidReason.INVALID_PROPERTIES,
+                            entity,
+                            {
+                                "error_message": f"{entity} has an invalid property type for property {prop}"
+                            },
+                        )
                     )
-                continue
-            processed_entities.append((EntitiesInvalidReason.VALID, entity))
+            processed_entities.append((EntitiesInvalidReason.VALID, entity, {}))
         ontology_relationships = {
-            r["relationship_name"]: r for r in self.ontology["relationships"]
+            r["relationship_name"]: r for r in ontology["relationships"]
         }
         for rel in relationships:
             if rel.name not in ontology_relationships.keys():
-                processsed_relationships.append(
-                    (EntitiesInvalidReason.INVALID_REL_TYPE, rel)
+                processed_relationships.append(
+                    (
+                        EntitiesInvalidReason.INVALID_REL_TYPE,
+                        rel,
+                        {"error_message": f"{rel} relationship name is invalid"},
+                    )
                 )
-                continue
-            entities_by_id = {e.unique_id: e for e in entities}
+            entities_by_id = {e[1].unique_id: e[1] for e in processed_entities}
             if (
                 rel.concept_from not in entities_by_id.keys()
                 or rel.concept_to not in entities_by_id.keys()
             ):
-                processsed_relationships.append(
-                    (EntitiesInvalidReason.UNKNOWN_UUID, rel)
+                processed_relationships.append(
+                    (
+                        EntitiesInvalidReason.UNKNOWN_UUID,
+                        rel,
+                        {
+                            "error_message": f"for {rel}, source concept or target concept are invalid"
+                        },
+                    )
                 )
-                continue
             ontology_relationship = ontology_relationships[rel.name]
             rel_concept_types = (
                 entities_by_id[rel.concept_from].concept_name,
                 entities_by_id[rel.concept_to].concept_name,
             )
             if not is_child_concept(
-                rel_concept_types[0], ontology_relationship["concept"], self.ontology
+                rel_concept_types[0],
+                ontology_relationship["concept"],
+                ontology,
             ) or not is_child_concept(
                 rel_concept_types[1],
                 ontology_relationship["target_concept"],
-                self.ontology,
+                ontology,
             ):
-                processsed_relationships.append(
-                    (EntitiesInvalidReason.WRONG_SOURCE_OR_TARGET_TYPE, rel)
+                processed_relationships.append(
+                    (
+                        EntitiesInvalidReason.WRONG_SOURCE_OR_TARGET_TYPE,
+                        rel,
+                        {
+                            "error_message": f"for {rel}, type for source concept or for target concept is invalid"
+                        },
+                    )
                 )
-                continue
-            processsed_relationships.append((EntitiesInvalidReason.VALID, rel))
-        return processed_entities, processsed_relationships
+            processed_relationships.append((EntitiesInvalidReason.VALID, rel, {}))
+        return processed_entities, processed_relationships
 
     def replace_unique_id(self, id_from, id_to, entities, relationships):
         for entity in entities:
@@ -628,32 +654,6 @@ class EntitiesParser(object):
             if relationship.concept_to == id_from:
                 relationship.concept_to = id_to
 
-    def extra_fields_to_entities(self, source_entities, remove_fields_from_source=True):
-        new_entities = list()
-        new_relationships = list()
-        for entity in source_entities:
-            if (
-                entity.fields
-                and "extra_fields" in entity.fields
-                and entity.fields["extra_fields"]
-            ):
-                new_entity = EntityInfo(
-                    self._compute_deterministic_uuid(
-                        entity.fields["extra_fields"], "json", False
-                    ),
-                    "json",
-                    entity.fields["extra_fields"],
-                )
-                if remove_fields_from_source:
-                    del entity.fields["extra_fields"]
-                new_entities.append(new_entity)
-                new_relationships.append(
-                    RelationshipInfo(
-                        entity.unique_id, new_entity.unique_id, "has_unparsed_data"
-                    )
-                )
-        return new_entities, new_relationships
-
     def to_linkchart(self, entities, relationships, label_fn):
         return_dict = {"records": list(), "relationships": list()}
         for entity in entities:

{streamlit_octostar_utils-0.1.7a9.dist-info → streamlit_octostar_utils-0.1.7a11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: streamlit-octostar-utils
-Version: 0.1.7a9
+Version: 0.1.7a11
 Summary: 
 License: MIT
 Author: Octostar

{streamlit_octostar_utils-0.1.7a9.dist-info → streamlit_octostar_utils-0.1.7a11.dist-info}/RECORD

@@ -1,11 +1,11 @@
 streamlit_octostar_utils/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 streamlit_octostar_utils/api_crafter/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 streamlit_octostar_utils/api_crafter/celery.py,sha256=bQq8P95j0XDWqx6Hdnm96PJL8kcp9ZcSKjveZUCQTVk,29874
-streamlit_octostar_utils/api_crafter/fastapi.py,sha256=vuy8cMY8as9GZc5cjBjZJXnudrqjYlPu1QGEyIKYKXw,14365
+streamlit_octostar_utils/api_crafter/fastapi.py,sha256=2bktT5Mwjs9XixWcOqUKMoLM_cgKl-cqZDUa2Imf4xA,14357
 streamlit_octostar_utils/api_crafter/nifi.py,sha256=fQ5k9eZl2oSQZ2BexZYwKUiO05-FryUi7wnCd_56P9Y,44375
 streamlit_octostar_utils/api_crafter/parser/__init__.py,sha256=YeYWF6sdQiCFV_RKNW2t9Vs6KJExE2pbXxWTe_DOayY,107
 streamlit_octostar_utils/api_crafter/parser/combine_fields.py,sha256=ddc44xkajw8MU0peAX_263DL7rPXbTKbHUjpOhRgvyU,8790
-streamlit_octostar_utils/api_crafter/parser/entities_parser.py,sha256=7mUxwcOcaIhDx3GnJ42p5L0PUfAiEvE_fkopNIujlL8,30067
+streamlit_octostar_utils/api_crafter/parser/entities_parser.py,sha256=zOQoN-p1Gz6ZzxvoX4M1b4Fi3mfmQr5zaNUcp_8gCjw,30016
 streamlit_octostar_utils/api_crafter/parser/generics.py,sha256=GefvTUWkqsICS_TdXA2p73_Uzh6041g88mWql3Fr9cY,1861
 streamlit_octostar_utils/api_crafter/parser/info.py,sha256=L2cdtsmfIdFSkAnIXhGhQZG6YMZRtY1GgLXn-847avA,649
 streamlit_octostar_utils/api_crafter/parser/linkchart_functions.py,sha256=WfHl-EfH4SWjpk8civS7HL11eIl4SAV5Dtwe8mTidrc,7163
@@ -37,7 +37,7 @@ streamlit_octostar_utils/threading/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzp
 streamlit_octostar_utils/threading/async_task_manager.py,sha256=q7N6YZwUvIYMzkSHmsJNheNVCv93c03H6Hyg9uH8pvk,4747
 streamlit_octostar_utils/threading/session_callback_manager.py,sha256=LvZVP4g6tvKtYmI13f2j1sX_7hm61Groqp5xJine9_k,3973
 streamlit_octostar_utils/threading/session_state_hot_swapper.py,sha256=6eeCQI6A42hp4DmW2NQw2rbeR-k9N8DhfBKQdN_fbLU,811
-streamlit_octostar_utils-0.1.7a9.dist-info/LICENSE,sha256=dkwVPyV03fPHHtERnF6RnvRXcll__tud9gWca1RcgnQ,1073
-streamlit_octostar_utils-0.1.7a9.dist-info/METADATA,sha256=VhXEOXyzVQhwg8qgd8XdBep95_fyXTk-4Lq2JhdpkzU,2267
-streamlit_octostar_utils-0.1.7a9.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-streamlit_octostar_utils-0.1.7a9.dist-info/RECORD,,
+streamlit_octostar_utils-0.1.7a11.dist-info/LICENSE,sha256=dkwVPyV03fPHHtERnF6RnvRXcll__tud9gWca1RcgnQ,1073
+streamlit_octostar_utils-0.1.7a11.dist-info/METADATA,sha256=sh4TvXiQ_9cxohuhsa_MuY8kcqGJZ2GnVBNCVRXpbpc,2268
+streamlit_octostar_utils-0.1.7a11.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+streamlit_octostar_utils-0.1.7a11.dist-info/RECORD,,