trustgraph-base 1.4.9__tar.gz → 1.4.11__tar.gz

{trustgraph_base-1.4.9 → trustgraph_base-1.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 1.4.9
+Version: 1.4.11
 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_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph/api/flow.py

@@ -87,7 +87,7 @@ class Flow:
 
         return json.loads(self.request(request = input)["flow"])
 
-    def start(self, class_name, id, description):
+    def start(self, class_name, id, description, parameters=None):
 
         # The input consists of system and prompt strings
         input = {
@@ -97,6 +97,9 @@ class Flow:
             "description": description,
         }
 
+        if parameters:
+            input["parameters"] = parameters
+
         self.request(request = input)
 
     def stop(self, id):

{trustgraph_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph/base/__init__.py

@@ -8,7 +8,7 @@ from . subscriber import Subscriber
 from . metrics import ProcessorMetrics, ConsumerMetrics, ProducerMetrics
 from . flow_processor import FlowProcessor
 from . consumer_spec import ConsumerSpec
-from . setting_spec import SettingSpec
+from . parameter_spec import ParameterSpec
 from . producer_spec import ProducerSpec
 from . subscriber_spec import SubscriberSpec
 from . request_response_spec import RequestResponseSpec

{trustgraph_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph/base/flow.py

@@ -12,7 +12,7 @@ class Flow:
         # Consumers and publishers.  Is this a bit untidy?
         self.consumer = {}
 
-        self.setting = {}
+        self.parameter = {}
 
         for spec in processor.specifications:
             spec.add(self, processor, defn)
@@ -28,5 +28,5 @@ class Flow:
     def __call__(self, key):
         if key in self.producer: return self.producer[key]
         if key in self.consumer: return self.consumer[key]
-        if key in self.setting: return self.setting[key].value
+        if key in self.parameter: return self.parameter[key].value
         return None

{trustgraph_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph/base/flow_processor.py

@@ -35,7 +35,7 @@ class FlowProcessor(AsyncProcessor):
 
         # These can be overriden by a derived class:
 
-        # Array of specifications: ConsumerSpec, ProducerSpec, SettingSpec
+        # Array of specifications: ConsumerSpec, ProducerSpec, ParameterSpec
         self.specifications = []
 
         logger.info("Service initialised.")

{trustgraph_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph/base/llm_service.py

@@ -9,7 +9,7 @@ from prometheus_client import Histogram
 
 from .. schema import TextCompletionRequest, TextCompletionResponse, Error
 from .. exceptions import TooManyRequests
-from .. base import FlowProcessor, ConsumerSpec, ProducerSpec
+from .. base import FlowProcessor, ConsumerSpec, ProducerSpec, ParameterSpec
 
 # Module logger
 logger = logging.getLogger(__name__)
@@ -56,6 +56,12 @@ class LlmService(FlowProcessor):
             )
         )
 
+        self.register_specification(
+            ParameterSpec(
+                name = "model",
+            )
+        )
+
         if not hasattr(__class__, "text_completion_metric"):
             __class__.text_completion_metric = Histogram(
                 'text_completion_duration',
@@ -85,8 +91,10 @@ class LlmService(FlowProcessor):
                     flow=f"{flow.name}-{consumer.name}",
             ).time():
 
+                model = flow("model")
+
                 response = await self.generate_content(
-                    request.system, request.prompt
+                    request.system, request.prompt, model
                 )
 
             await flow("response").send(

trustgraph_base-1.4.9/trustgraph/base/setting_spec.py → trustgraph_base-1.4.11/trustgraph/base/parameter_spec.py

@@ -1,7 +1,7 @@
 
 from . spec import Spec
 
-class Setting:
+class Parameter:
     def __init__(self, value):
         self.value = value
     async def start():
@@ -9,11 +9,13 @@ class Setting:
     async def stop():
         pass
         
-class SettingSpec(Spec):
+class ParameterSpec(Spec):
     def __init__(self, name):
         self.name = name
 
     def add(self, flow, processor, definition):
 
-        flow.config[self.name] = Setting(definition[self.name])
+        value = definition.get(self.name, None)
+
+        flow.parameter[self.name] = Parameter(value)
 

trustgraph_base-1.4.11/trustgraph/base_version.py

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

{trustgraph_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph/messaging/translators/flow.py

@@ -12,12 +12,13 @@ class FlowRequestTranslator(MessageTranslator):
             class_name=data.get("class-name"),
             class_definition=data.get("class-definition"),
             description=data.get("description"),
-            flow_id=data.get("flow-id")
+            flow_id=data.get("flow-id"),
+            parameters=data.get("parameters")
         )
     
     def from_pulsar(self, obj: FlowRequest) -> Dict[str, Any]:
         result = {}
-        
+
         if obj.operation is not None:
             result["operation"] = obj.operation
         if obj.class_name is not None:
@@ -28,7 +29,9 @@ class FlowRequestTranslator(MessageTranslator):
             result["description"] = obj.description
         if obj.flow_id is not None:
             result["flow-id"] = obj.flow_id
-        
+        if obj.parameters is not None:
+            result["parameters"] = obj.parameters
+
         return result
 
 
@@ -40,7 +43,7 @@ class FlowResponseTranslator(MessageTranslator):
     
     def from_pulsar(self, obj: FlowResponse) -> Dict[str, Any]:
         result = {}
-        
+
         if obj.class_names is not None:
             result["class-names"] = obj.class_names
         if obj.flow_ids is not None:
@@ -51,7 +54,9 @@ class FlowResponseTranslator(MessageTranslator):
             result["flow"] = obj.flow
         if obj.description is not None:
             result["description"] = obj.description
-        
+        if obj.parameters is not None:
+            result["parameters"] = obj.parameters
+
         return result
     
     def from_response_with_completion(self, obj: FlowResponse) -> Tuple[Dict[str, Any], bool]:

{trustgraph_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph/schema/services/flow.py

@@ -35,6 +35,9 @@ class FlowRequest(Record):
     # get_flow, start_flow, stop_flow
     flow_id = String()
 
+    # start_flow - optional parameters for flow customization
+    parameters = Map(String())
+
 class FlowResponse(Record):
 
     # list_classes
@@ -52,6 +55,9 @@ class FlowResponse(Record):
     # get_flow
     description = String()
 
+    # get_flow - parameters used when flow was started
+    parameters = Map(String())
+
     # Everything
     error = Error()
 

{trustgraph_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph_base.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 1.4.9
+Version: 1.4.11
 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_base-1.4.9 → trustgraph_base-1.4.11}/trustgraph_base.egg-info/SOURCES.txt

@@ -33,13 +33,13 @@ trustgraph/base/graph_embeddings_store_service.py
 trustgraph/base/graph_rag_client.py
 trustgraph/base/llm_service.py
 trustgraph/base/metrics.py
+trustgraph/base/parameter_spec.py
 trustgraph/base/producer.py
 trustgraph/base/producer_spec.py
 trustgraph/base/prompt_client.py
 trustgraph/base/publisher.py
 trustgraph/base/pubsub.py
 trustgraph/base/request_response_spec.py
-trustgraph/base/setting_spec.py
 trustgraph/base/spec.py
 trustgraph/base/structured_query_client.py
 trustgraph/base/subscriber.py

trustgraph_base-1.4.9/trustgraph/base_version.py

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