monocle-apptrace 0.3.0b3__tar.gz → 0.3.0b4__tar.gz

{monocle_apptrace-0.3.0b3 → monocle_apptrace-0.3.0b4}/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Version 0.3.0b3 (2024-12-10)
+## Version 0.3.0b4 (2024-12-10)
 
 - Add dev dependency for Mistral AI integration ([#81](https://github.com/monocle2ai/monocle/pull/81))
 - Add VectorStore deployment URL capture support ([#80](https://github.com/monocle2ai/monocle/pull/80))  

{monocle_apptrace-0.3.0b3 → monocle_apptrace-0.3.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.3.0b3
+Version: 0.3.0b4
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues

{monocle_apptrace-0.3.0b3 → monocle_apptrace-0.3.0b4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "monocle_apptrace"
-version = "0.3.0b3"
+version = "0.3.0b4"
 authors = []
 description = "package with monocle genAI tracing"
 readme = "README.md"

{monocle_apptrace-0.3.0b3 → monocle_apptrace-0.3.0b4}/src/monocle_apptrace/exporters/aws/s3_exporter.py

@@ -28,14 +28,22 @@ class S3SpanExporter(SpanExporterBase):
         DEFAULT_TIME_FORMAT = "%Y-%m-%d__%H.%M.%S"
         self.max_batch_size = 500
         self.export_interval = 1
-        self.s3_client = boto3.client(
-            's3',
-            aws_access_key_id=os.getenv('AWS_ACCESS_KEY_ID'),
-            aws_secret_access_key=os.getenv('AWS_SECRET_ACCESS_KEY'),
-            region_name=region_name,
-        )
+        if(os.getenv('MONOCLE_AWS_ACCESS_KEY_ID') and os.getenv('MONOCLE_AWS_SECRET_ACCESS_KEY')):
+            self.s3_client = boto3.client(
+                's3',
+                aws_access_key_id=os.getenv('MONOCLE_AWS_ACCESS_KEY_ID'),
+                aws_secret_access_key=os.getenv('MONOCLE_AWS_SECRET_ACCESS_KEY'),
+                region_name=region_name,
+            )
+        else:
+            self.s3_client = boto3.client(
+                's3',
+                aws_access_key_id=os.getenv('AWS_ACCESS_KEY_ID'),
+                aws_secret_access_key=os.getenv('AWS_SECRET_ACCESS_KEY'),
+                region_name=region_name,
+            )
         self.bucket_name = bucket_name or os.getenv('MONOCLE_S3_BUCKET_NAME','default-bucket')
-        self.file_prefix = DEFAULT_FILE_PREFIX
+        self.file_prefix = os.getenv('MONOCLE_S3_KEY_PREFIX', DEFAULT_FILE_PREFIX)
         self.time_format = DEFAULT_TIME_FORMAT
         self.export_queue = []
         self.last_export_time = time.time()
@@ -142,7 +150,8 @@ class S3SpanExporter(SpanExporterBase):
     @SpanExporterBase.retry_with_backoff(exceptions=(EndpointConnectionError, ConnectionClosedError, ReadTimeoutError, ConnectTimeoutError))
     def __upload_to_s3(self, span_data_batch: str):
         current_time = datetime.datetime.now().strftime(self.time_format)
-        file_name = f"{self.file_prefix}{current_time}.ndjson"
+        prefix = self.file_prefix + os.environ.get('MONOCLE_S3_KEY_PREFIX_CURRENT', '')
+        file_name = f"{prefix}{current_time}.ndjson"
         self.s3_client.put_object(
             Bucket=self.bucket_name,
             Key=file_name,

{monocle_apptrace-0.3.0b3 → monocle_apptrace-0.3.0b4}/src/monocle_apptrace/instrumentation/common/span_handler.py

@@ -75,7 +75,7 @@ class SpanHandler:
                                 if result and isinstance(result, str):
                                     span.set_attribute(attribute_name, result)
                             except Exception as e:
-                                logger.error(f"Error processing accessor: {e}")
+                                logger.debug(f"Error processing accessor: {e}")
                         else:
                             logger.warning(f"{' and '.join([key for key in ['attribute', 'accessor'] if not processor.get(key)])} not found or incorrect in entity JSON")
                     span_index += 1
@@ -106,7 +106,7 @@ class SpanHandler:
                                 else:
                                     event_attributes.update(accessor(arguments))
                             except Exception as e:
-                                logger.error(f"Error evaluating accessor for attribute '{attribute_key}': {e}")
+                                logger.debug(f"Error evaluating accessor for attribute '{attribute_key}': {e}")
                     span.add_event(name=event_name, attributes=event_attributes)
 
 

{monocle_apptrace-0.3.0b3 → monocle_apptrace-0.3.0b4}/src/monocle_apptrace/instrumentation/metamodel/langchain/_helper.py

@@ -19,6 +19,8 @@ def extract_messages(args):
     """Extract system and user messages"""
     try:
         messages = []
+        if args and isinstance(args, (list, tuple)) and hasattr(args[0], 'text'):
+            return [args[0].text]
         if args and isinstance(args, (list, tuple)) and len(args) > 0:
             if hasattr(args[0], "messages") and isinstance(args[0].messages, list):
                 for msg in args[0].messages: