trustgraph-flow 2.5.2__tar.gz → 2.5.3__tar.gz

{trustgraph_flow-2.5.2 → trustgraph_flow-2.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 2.5.2
+Version: 2.5.3
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

trustgraph_flow-2.5.3/trustgraph/flow_version.py

@@ -0,0 +1 @@
+__version__ = "2.5.3"

{trustgraph_flow-2.5.2 → trustgraph_flow-2.5.3}/trustgraph/query/ontology/__init__.py

@@ -7,7 +7,7 @@ Provides semantic query understanding, ontology matching, and answer generation.
 
 from .query_service import OntoRAGQueryService, QueryRequest, QueryResponse
 from .question_analyzer import QuestionAnalyzer, QuestionComponents, QuestionType
-from .ontology_matcher import OntologyMatcher, QueryOntologySubset
+from .ontology_matcher import OntologyMatcherForQueries, QueryOntologySubset
 from .backend_router import BackendRouter, BackendType, QueryRoute
 from .sparql_generator import SPARQLGenerator, SPARQLQuery
 from .sparql_cassandra import SPARQLCassandraEngine, SPARQLResult
@@ -27,7 +27,7 @@ __all__ = [
     'QuestionType',
 
     # Ontology matching
-    'OntologyMatcher',
+    'OntologyMatcherForQueries',
     'QueryOntologySubset',
 
     # Backend routing

{trustgraph_flow-2.5.2 → trustgraph_flow-2.5.3}/trustgraph/query/ontology/monitoring.py

@@ -4,6 +4,7 @@ Provides comprehensive monitoring of system performance, query patterns, and res
 """
 
 import logging
+import re
 import time
 import asyncio
 import inspect
@@ -276,6 +277,26 @@ class MetricsCollector:
         return f"{name}{{{label_str}}}"
 
 
+def _extract_metric_label(metric_name: str, label: str) -> Optional[str]:
+    """Extract a label value from an internal metric key."""
+    labels_start = metric_name.find('{')
+    labels_end = metric_name.find('}', labels_start + 1)
+
+    if labels_start == -1 or labels_end == -1:
+        return None
+
+    labels = metric_name[labels_start + 1:labels_end]
+    label_match = re.search(
+        rf'(?:^|,){re.escape(label)}=(?:"([^"]*)"|([^,]*))',
+        labels,
+    )
+    if not label_match:
+        return None
+
+    quoted_value, unquoted_value = label_match.groups()
+    return quoted_value if quoted_value is not None else unquoted_value
+
+
 class PerformanceMonitor:
     """Monitors system performance and component health."""
 
@@ -474,8 +495,8 @@ class PerformanceMonitor:
         # Cache performance
         cache_types = set()
         for metric_name in self.metrics_collector.counters.keys():
-            if 'cache_type=' in metric_name:
-                cache_type = metric_name.split('cache_type=')[1].split(',')[0].split('}')[0]
+            cache_type = _extract_metric_label(metric_name, 'cache_type')
+            if cache_type is not None:
                 cache_types.add(cache_type)
 
         for cache_type in cache_types:

{trustgraph_flow-2.5.2 → trustgraph_flow-2.5.3}/trustgraph/query/ontology/ontology_matcher.py

@@ -7,10 +7,10 @@ import logging
 from typing import List, Dict, Any, Set, Optional
 from dataclasses import dataclass
 
-from ...extract.kg.ontology.ontology_loader import Ontology, OntologyLoader
-from ...extract.kg.ontology.ontology_embedder import OntologyEmbedder
-from ...extract.kg.ontology.text_processor import TextSegment
-from ...extract.kg.ontology.ontology_selector import OntologySelector, OntologySubset
+from trustgraph.extract.kg.ontology.ontology_loader import Ontology, OntologyLoader
+from trustgraph.extract.kg.ontology.ontology_embedder import OntologyEmbedder
+from trustgraph.extract.kg.ontology.text_processor import TextSegment
+from trustgraph.extract.kg.ontology.ontology_selector import OntologySelector, OntologySubset
 from .question_analyzer import QuestionComponents, QuestionType
 
 logger = logging.getLogger(__name__)

{trustgraph_flow-2.5.2 → trustgraph_flow-2.5.3}/trustgraph/query/ontology/query_service.py

@@ -8,13 +8,13 @@ from typing import Dict, Any, List, Optional, Union
 from dataclasses import dataclass
 from datetime import datetime
 
-from ....flow.flow_processor import FlowProcessor
-from ....tables.config import ConfigTableStore
-from ...extract.kg.ontology.ontology_loader import OntologyLoader
-from ...extract.kg.ontology.vector_store import InMemoryVectorStore
+from trustgraph.base.flow_processor import FlowProcessor
+from trustgraph.tables.config import ConfigTableStore
+from trustgraph.extract.kg.ontology.ontology_loader import OntologyLoader
+from trustgraph.extract.kg.ontology.vector_store import InMemoryVectorStore
 
 from .question_analyzer import QuestionAnalyzer, QuestionComponents
-from .ontology_matcher import OntologyMatcher, QueryOntologySubset
+from .ontology_matcher import OntologyMatcherForQueries, QueryOntologySubset
 from .backend_router import BackendRouter, QueryRoute, BackendType
 from .sparql_generator import SPARQLGenerator, SPARQLQuery
 from .sparql_cassandra import SPARQLCassandraEngine, SPARQLResult
@@ -105,7 +105,7 @@ class OntoRAGQueryService(FlowProcessor):
 
         # Initialize ontology matcher
         matcher_config = self.config.get('ontology_matcher', {})
-        self.ontology_matcher = OntologyMatcher(
+        self.ontology_matcher = OntologyMatcherForQueries(
             vector_store=self.vector_store,
             embedding_service=self.embedding_service,
             config=matcher_config

{trustgraph_flow-2.5.2 → trustgraph_flow-2.5.3}/trustgraph/query/ontology/sparql_cassandra.py

@@ -28,7 +28,7 @@ try:
 except ImportError:
     CASSANDRA_AVAILABLE = False
 
-from ....tables.config import ConfigTableStore
+from trustgraph.tables.config import ConfigTableStore
 
 logger = logging.getLogger(__name__)
 

{trustgraph_flow-2.5.2 → trustgraph_flow-2.5.3}/trustgraph/template/prompt_manager.py

@@ -31,12 +31,12 @@ class PromptManager:
 
         try:
             system = json.loads(config["system"])
-        except:
+        except (KeyError, TypeError, json.JSONDecodeError):
             system = "Be helpful."
 
         try:
             ix = json.loads(config["template-index"])
-        except:
+        except (KeyError, TypeError, json.JSONDecodeError):
             ix = []
 
         prompts = {}
@@ -68,8 +68,8 @@ class PromptManager:
 
         try:
             self.system_template = ibis.Template(self.config.system_template)
-        except:
-            raise RuntimeError("Error in system template")
+        except Exception as e:
+            raise RuntimeError(f"Error in system template: {e}")
 
         self.templates = {}
         for k, v in self.prompts.items():
@@ -136,8 +136,6 @@ class PromptManager:
 
         terms = self.terms | self.prompts[id].terms | input
 
-        resp_type = self.prompts[id].response_type
-
         return self.templates[id].render(terms)
 
     async def invoke(self, id, input, llm):
@@ -161,7 +159,7 @@ class PromptManager:
         if resp_type == "json":
             try:
                 obj = self.parse_json(resp)
-            except:
+            except (json.JSONDecodeError, TypeError):
                 logger.error(f"JSON parse failed: {resp}")
                 raise RuntimeError("JSON parse fail")
 
@@ -195,4 +193,3 @@ class PromptManager:
             return objects
 
         raise RuntimeError(f"Response type {resp_type} not known")
-

{trustgraph_flow-2.5.2 → trustgraph_flow-2.5.3}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 2.5.2
+Version: 2.5.3
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

trustgraph_flow-2.5.2/trustgraph/flow_version.py

@@ -1 +0,0 @@
-__version__ = "2.5.2"