monocle-apptrace 0.3.0b3__py3-none-any.whl → 0.3.0b4__py3-none-any.whl

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/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/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:

{monocle_apptrace-0.3.0b3.dist-info → monocle_apptrace-0.3.0b4.dist-info}/METADATA

@@ -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.dist-info → monocle_apptrace-0.3.0b4.dist-info}/RECORD

@@ -4,7 +4,7 @@ monocle_apptrace/exporters/base_exporter.py,sha256=Gov_QKp5fonVZ-YdNM2ynoPot7GCa
 monocle_apptrace/exporters/exporter_processor.py,sha256=BTcBgMuFLHCdCgVvc9TKIo9y8g1BvShI0L4vX6Q-cmk,393
 monocle_apptrace/exporters/file_exporter.py,sha256=gN9pJ_X5pcstVVsyivgHsjWhr443eRa6Y6Hx1rGLQAM,2280
 monocle_apptrace/exporters/monocle_exporters.py,sha256=WRcRnnN0gSL7khN-BZ9wonMKiWaHNFqnBZ-QyM6hMsg,2177
-monocle_apptrace/exporters/aws/s3_exporter.py,sha256=eq5SfZmaeyhtXeXYnJGAfT1vlaNGSyh1leGX9Rr7vQ4,6619
+monocle_apptrace/exporters/aws/s3_exporter.py,sha256=JMxtox61J6gUoEFsM1PJisBJPySMpm_U2Uv68WioKtE,7146
 monocle_apptrace/exporters/aws/s3_exporter_opendal.py,sha256=FvyW0KkAz0W_1g16C_ERmamg4fSreT-UXgLaN9URTVQ,5057
 monocle_apptrace/exporters/azure/blob_exporter.py,sha256=m7Hsw3OXlP2GOCQcdxf8LM6Fe12fZmih45x82Z12dbI,5597
 monocle_apptrace/exporters/azure/blob_exporter_opendal.py,sha256=h5xv7JU6YEXL4AKT2B1op3YsHoA0rNnLCGq8seoVRWs,6114
@@ -13,7 +13,7 @@ monocle_apptrace/instrumentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 monocle_apptrace/instrumentation/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/common/constants.py,sha256=ySfwN5ZUtNFwm3ba5QWxBpLmZVuBRqVltuaBvpk-e3Y,1937
 monocle_apptrace/instrumentation/common/instrumentor.py,sha256=v79pmHDRf64G1Y0A6RMZlxbKizYRuNwlkJpRabESDiU,8386
-monocle_apptrace/instrumentation/common/span_handler.py,sha256=d5ycN3_OYkNm6_XKuAybMa-s1o6VrH92bEiR-Q_Hj24,7141
+monocle_apptrace/instrumentation/common/span_handler.py,sha256=G00LWciyoODiaXRtjqLDFspiHVBpx04HBJfxTUE79ak,7141
 monocle_apptrace/instrumentation/common/utils.py,sha256=nX3TErgaaYSlebYqQHuj4nqFyU51-nMrdIbQmO2vOTI,5357
 monocle_apptrace/instrumentation/common/wrapper.py,sha256=Q-7gyJpTtNpY1-khduT3vykvOewQ8qKzKQfYaZjho7s,2864
 monocle_apptrace/instrumentation/common/wrapper_method.py,sha256=rWiSdzhZrnWnNVVAZMetPboCH2HHSOZ7KgI7dPwGxV8,1629
@@ -30,7 +30,7 @@ monocle_apptrace/instrumentation/metamodel/haystack/entities/__init__.py,sha256=
 monocle_apptrace/instrumentation/metamodel/haystack/entities/inference.py,sha256=PkCaaar5hbZH7YGtWisq8dUJqBINsFGmtaUgt11UDa4,3019
 monocle_apptrace/instrumentation/metamodel/haystack/entities/retrieval.py,sha256=nq3lsk2qFxXqwrAHsBt8zrh4ZVGAJABkPtylrjUCCqc,2357
 monocle_apptrace/instrumentation/metamodel/langchain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-monocle_apptrace/instrumentation/metamodel/langchain/_helper.py,sha256=7GixVwwzYR_Vcit1YN-xscA00HWFxOx7lcpqI94zi-w,4535
+monocle_apptrace/instrumentation/metamodel/langchain/_helper.py,sha256=txpamIJKAOBVIEq0ndqWBkFghMJi38NWrieW3lNfK34,4651
 monocle_apptrace/instrumentation/metamodel/langchain/methods.py,sha256=xEWO4uSiOnR221cvXESnVgAfC6JeExsP46ZkbK8_Yqs,3027
 monocle_apptrace/instrumentation/metamodel/langchain/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/langchain/entities/inference.py,sha256=wjW9hb1Qwr_aqY0lPehdPftyHtuvHinGxVmy0TVj5xo,2705
@@ -41,8 +41,8 @@ monocle_apptrace/instrumentation/metamodel/llamaindex/methods.py,sha256=THr-nmeG
 monocle_apptrace/instrumentation/metamodel/llamaindex/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/llamaindex/entities/inference.py,sha256=585hJXbdN2kFOnABv12vlzFkCbDExZln5ISvQI71EHw,2623
 monocle_apptrace/instrumentation/metamodel/llamaindex/entities/retrieval.py,sha256=QBF1nrqog5KHh925jiY2V-kejL6iVLKUowZmqUDoiJ4,1870
-monocle_apptrace-0.3.0b3.dist-info/METADATA,sha256=VVAF6k-HKzOqIX05cguZz9fmkySu6CKpNWr8ynwRo8I,6265
-monocle_apptrace-0.3.0b3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-monocle_apptrace-0.3.0b3.dist-info/licenses/LICENSE,sha256=ay9trLiP5I7ZsFXo6AqtkLYdRqe5S9r-DrPOvsNlZrg,9136
-monocle_apptrace-0.3.0b3.dist-info/licenses/NOTICE,sha256=9jn4xtwM_uUetJMx5WqGnhrR7MIhpoRlpokjSTlyt8c,112
-monocle_apptrace-0.3.0b3.dist-info/RECORD,,
+monocle_apptrace-0.3.0b4.dist-info/METADATA,sha256=uMbXIhUajnOyxh8n6q2P3RxPC7p6I1aFOmQj772omQs,6265
+monocle_apptrace-0.3.0b4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+monocle_apptrace-0.3.0b4.dist-info/licenses/LICENSE,sha256=ay9trLiP5I7ZsFXo6AqtkLYdRqe5S9r-DrPOvsNlZrg,9136
+monocle_apptrace-0.3.0b4.dist-info/licenses/NOTICE,sha256=9jn4xtwM_uUetJMx5WqGnhrR7MIhpoRlpokjSTlyt8c,112
+monocle_apptrace-0.3.0b4.dist-info/RECORD,,