trustgraph-bedrock 0.12.5__tar.gz → 0.13.0__tar.gz

{trustgraph-bedrock-0.12.5 → trustgraph-bedrock-0.13.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: trustgraph-bedrock
-Version: 0.12.5
+Version: 0.13.0
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Home-page: https://github.com/trustgraph-ai/trustgraph
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 License: UNKNOWN
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.12.5.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.13.0.tar.gz
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{trustgraph-bedrock-0.12.5 → trustgraph-bedrock-0.13.0}/setup.py

@@ -34,7 +34,7 @@ setuptools.setup(
     python_requires='>=3.8',
     download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz",
     install_requires=[
-        "trustgraph-base>=0.12,<0.13",
+        "trustgraph-base>=0.13,<0.14",
         "pulsar-client",
         "prometheus-client",
         "boto3",

trustgraph-bedrock-0.13.0/trustgraph/bedrock_version.py

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

{trustgraph-bedrock-0.12.5 → trustgraph-bedrock-0.13.0}/trustgraph/model/text_completion/bedrock/llm.py

@@ -7,6 +7,7 @@ Input is prompt, output is response. Mistral is default.
 import boto3
 import json
 from prometheus_client import Histogram
+import os
 
 from .... schema import TextCompletionRequest, TextCompletionResponse, Error
 from .... schema import text_completion_request_queue
@@ -21,10 +22,11 @@ default_input_queue = text_completion_request_queue
 default_output_queue = text_completion_response_queue
 default_subscriber = module
 default_model = 'mistral.mistral-large-2407-v1:0'
-default_region = 'us-west-2'
 default_temperature = 0.0
 default_max_output = 2048
-
+default_aws_id_key = os.getenv("AWS_ID_KEY", None)
+default_aws_secret = os.getenv("AWS_SECRET", None)
+default_aws_region = os.getenv("AWS_REGION", 'us-west-2')
 
 class Processor(ConsumerProducer):
 
@@ -34,12 +36,21 @@ class Processor(ConsumerProducer):
         output_queue = params.get("output_queue", default_output_queue)
         subscriber = params.get("subscriber", default_subscriber)
         model = params.get("model", default_model)
-        aws_id = params.get("aws_id_key")
-        aws_secret = params.get("aws_secret")
-        aws_region = params.get("aws_region", default_region)
+        aws_id_key = params.get("aws_id_key", default_aws_id_key)
+        aws_secret = params.get("aws_secret", default_aws_secret)
+        aws_region = params.get("aws_region", default_aws_region)
         temperature = params.get("temperature", default_temperature)
         max_output = params.get("max_output", default_max_output)
 
+        if aws_id_key is None:
+            raise RuntimeError("AWS ID not specified")
+
+        if aws_secret is None:
+            raise RuntimeError("AWS secret not specified")
+
+        if aws_region is None:
+            raise RuntimeError("AWS region not specified")
+
         super(Processor, self).__init__(
             **params | {
                 "input_queue": input_queue,
@@ -71,7 +82,7 @@ class Processor(ConsumerProducer):
         self.max_output = max_output
 
         self.session = boto3.Session(
-            aws_access_key_id=aws_id,
+            aws_access_key_id=aws_id_key,
             aws_secret_access_key=aws_secret,
             region_name=aws_region
         )
@@ -289,17 +300,20 @@ class Processor(ConsumerProducer):
 
         parser.add_argument(
             '-z', '--aws-id-key',
+            default=default_aws_id_key,
             help=f'AWS ID Key'
         )
 
         parser.add_argument(
             '-k', '--aws-secret',
+            default=default_aws_secret,
             help=f'AWS Secret Key'
         )
 
         parser.add_argument(
             '-r', '--aws-region',
-            help=f'AWS Region (default: us-west-2)'
+            default=default_aws_region,
+            help=f'AWS Region'
         )
 
         parser.add_argument(
@@ -320,4 +334,3 @@ def run():
 
     Processor.start(module, __doc__)
 
-    

{trustgraph-bedrock-0.12.5 → trustgraph-bedrock-0.13.0}/trustgraph_bedrock.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: trustgraph-bedrock
-Version: 0.12.5
+Version: 0.13.0
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Home-page: https://github.com/trustgraph-ai/trustgraph
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 License: UNKNOWN
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.12.5.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.13.0.tar.gz
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{trustgraph-bedrock-0.12.5 → trustgraph-bedrock-0.13.0}/trustgraph_bedrock.egg-info/requires.txt

@@ -1,4 +1,4 @@
 boto3
 prometheus-client
 pulsar-client
-trustgraph-base<0.13,>=0.12
+trustgraph-base<0.14,>=0.13

trustgraph-bedrock-0.12.5/trustgraph/bedrock_version.py

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