trustgraph-bedrock 1.2.0__tar.gz → 1.2.4__tar.gz

{trustgraph-bedrock-1.2.0 → trustgraph_bedrock-1.2.4}/PKG-INFO

@@ -1,15 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: trustgraph-bedrock
-Version: 1.2.0
+Version: 1.2.4
 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
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v1.2.0.tar.gz
-Author: trustgraph.ai
-Author-email: security@trustgraph.ai
+Author-email: "trustgraph.ai" <security@trustgraph.ai>
+Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: trustgraph-base<1.3,>=1.2
+Requires-Dist: pulsar-client
+Requires-Dist: prometheus-client
+Requires-Dist: boto3
 
 See https://trustgraph.ai/

trustgraph_bedrock-1.2.4/pyproject.toml

@@ -0,0 +1,33 @@
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "trustgraph-bedrock"
+dynamic = ["version"]
+authors = [{name = "trustgraph.ai", email = "security@trustgraph.ai"}]
+description = "TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline."
+readme = "README.md"
+requires-python = ">=3.8"
+dependencies = [
+    "trustgraph-base>=1.2,<1.3",
+    "pulsar-client",
+    "prometheus-client",
+    "boto3",
+]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+]
+
+[project.urls]
+Homepage = "https://github.com/trustgraph-ai/trustgraph"
+
+[project.scripts]
+text-completion-bedrock = "trustgraph.model.text_completion.bedrock:run"
+
+[tool.setuptools.packages.find]
+include = ["trustgraph*"]
+
+[tool.setuptools.dynamic]
+version = {attr = "trustgraph.bedrock_version.__version__"}

trustgraph_bedrock-1.2.4/trustgraph/bedrock_version.py

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

{trustgraph-bedrock-1.2.0 → trustgraph_bedrock-1.2.4}/trustgraph/model/text_completion/bedrock/llm.py

@@ -8,10 +8,14 @@ import boto3
 import json
 import os
 import enum
+import logging
 
 from .... exceptions import TooManyRequests
 from .... base import LlmService, LlmResult
 
+# Module logger
+logger = logging.getLogger(__name__)
+
 default_ident = "text-completion"
 
 default_model = 'mistral.mistral-large-2407-v1:0'
@@ -145,7 +149,7 @@ class Processor(LlmService):
 
     def __init__(self, **params):
 
-        print(params)
+        logger.debug(f"Bedrock LLM initialized with params: {params}")
     
         model = params.get("model", default_model)
         temperature = params.get("temperature", default_temperature)
@@ -197,7 +201,7 @@ class Processor(LlmService):
 
         self.bedrock = self.session.client(service_name='bedrock-runtime')
 
-        print("Initialised", flush=True)
+        logger.info("Bedrock LLM service initialized")
 
     def determine_variant(self, model):
 
@@ -250,9 +254,9 @@ class Processor(LlmService):
             inputtokens = int(metadata['x-amzn-bedrock-input-token-count'])
             outputtokens = int(metadata['x-amzn-bedrock-output-token-count'])
 
-            print(outputtext, flush=True)
-            print(f"Input Tokens: {inputtokens}", flush=True)
-            print(f"Output Tokens: {outputtokens}", flush=True)
+            logger.debug(f"LLM output: {outputtext}")
+            logger.info(f"Input Tokens: {inputtokens}")
+            logger.info(f"Output Tokens: {outputtokens}")
 
             resp = LlmResult(
                 text = outputtext,
@@ -265,7 +269,7 @@ class Processor(LlmService):
 
         except self.bedrock.exceptions.ThrottlingException as e:
 
-            print("Hit rate limit:", e, flush=True)
+            logger.warning(f"Hit rate limit: {e}")
 
             # Leave rate limit retries to the base handler
             raise TooManyRequests()
@@ -274,8 +278,7 @@ class Processor(LlmService):
 
             # Apart from rate limits, treat all exceptions as unrecoverable
 
-            print(type(e))
-            print(f"Exception: {e}")
+            logger.error(f"Bedrock LLM exception ({type(e).__name__}): {e}", exc_info=True)
             raise e
 
     @staticmethod

{trustgraph-bedrock-1.2.0 → trustgraph_bedrock-1.2.4}/trustgraph_bedrock.egg-info/PKG-INFO

@@ -1,15 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: trustgraph-bedrock
-Version: 1.2.0
+Version: 1.2.4
 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
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v1.2.0.tar.gz
-Author: trustgraph.ai
-Author-email: security@trustgraph.ai
+Author-email: "trustgraph.ai" <security@trustgraph.ai>
+Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: trustgraph-base<1.3,>=1.2
+Requires-Dist: pulsar-client
+Requires-Dist: prometheus-client
+Requires-Dist: boto3
 
 See https://trustgraph.ai/

{trustgraph-bedrock-1.2.0 → trustgraph_bedrock-1.2.4}/trustgraph_bedrock.egg-info/SOURCES.txt

@@ -1,6 +1,5 @@
 README.md
-setup.py
-scripts/text-completion-bedrock
+pyproject.toml
 trustgraph/bedrock_version.py
 trustgraph/model/text_completion/bedrock/__init__.py
 trustgraph/model/text_completion/bedrock/__main__.py
@@ -8,5 +7,6 @@ trustgraph/model/text_completion/bedrock/llm.py
 trustgraph_bedrock.egg-info/PKG-INFO
 trustgraph_bedrock.egg-info/SOURCES.txt
 trustgraph_bedrock.egg-info/dependency_links.txt
+trustgraph_bedrock.egg-info/entry_points.txt
 trustgraph_bedrock.egg-info/requires.txt
 trustgraph_bedrock.egg-info/top_level.txt

trustgraph_bedrock-1.2.4/trustgraph_bedrock.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+text-completion-bedrock = trustgraph.model.text_completion.bedrock:run

{trustgraph-bedrock-1.2.0 → trustgraph_bedrock-1.2.4}/trustgraph_bedrock.egg-info/top_level.txt

@@ -1,2 +1 @@
-scripts
 trustgraph

trustgraph-bedrock-1.2.0/scripts/text-completion-bedrock

@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-
-from trustgraph.model.text_completion.bedrock import run
-
-run()
-

trustgraph-bedrock-1.2.0/setup.py

@@ -1,45 +0,0 @@
-import setuptools
-import os
-import importlib
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-# Load a version number module
-spec = importlib.util.spec_from_file_location(
-    'version', 'trustgraph/bedrock_version.py'
-)
-version_module = importlib.util.module_from_spec(spec)
-spec.loader.exec_module(version_module)
-
-version = version_module.__version__
-
-setuptools.setup(
-    name="trustgraph-bedrock",
-    version=version,
-    author="trustgraph.ai",
-    author_email="security@trustgraph.ai",
-    description="TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/trustgraph-ai/trustgraph",
-    packages=setuptools.find_namespace_packages(
-        where='./',
-    ),
-    classifiers=[ 
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
-        "Operating System :: OS Independent",
-    ],
-    python_requires='>=3.8',
-    download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz",
-    install_requires=[
-        "trustgraph-base>=1.2,<1.3",
-        "pulsar-client",
-        "prometheus-client",
-        "boto3",
-    ],
-    scripts=[
-        "scripts/text-completion-bedrock",
-    ]
-)

trustgraph-bedrock-1.2.0/trustgraph/bedrock_version.py

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

{trustgraph-bedrock-1.2.0 → trustgraph_bedrock-1.2.4}/trustgraph_bedrock.egg-info/requires.txt

@@ -1,4 +1,4 @@
-boto3
-prometheus-client
-pulsar-client
 trustgraph-base<1.3,>=1.2
+pulsar-client
+prometheus-client
+boto3