whatap-python 1.8.6__tar.gz → 1.8.8__tar.gz

{whatap_python-1.8.6 → whatap_python-1.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: whatap-python
-Version: 1.8.6
+Version: 1.8.8
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

{whatap_python-1.8.6 → whatap_python-1.8.8}/whatap/__init__.py

@@ -52,12 +52,14 @@ def preview_whatap_conf(option_name:str):
     home = os.environ.get('WHATAP_HOME', '.')
     whatap_config = os.path.join(home, 'whatap.conf')
 
-    #기본 default 값 설정
-    if option_name == "ignore_whatap_stdout":
-        value = 'false'
-    elif option_name == "standalone_enabled":
-        value = 'false'
 
+    """
+    현재 preview_whatap_conf 를 사용중인 옵션
+    - ignore_whatap_stdout (False)
+    - standalone_enabled (False)
+    - open_file_descriptor_enabled (False)
+    """
+    value = 'false'
     try:
         with open(whatap_config) as f:
             for raw in f:
@@ -338,10 +340,10 @@ def hooks(home):
 
             if conf.standalone_enabled:
                 if conf.standalone_type == 'multiple-transaction':
-                    from whatap.trace.mod.standalone_multiple import instrument_standalone_multiple
+                    from whatap.trace.mod.standalone.multiple import instrument_standalone_multiple
                     instrument_standalone_multiple()
                 else:
-                    from whatap.trace.mod.standalone_single import instrument_standalone_single
+                    from whatap.trace.mod.standalone.single import instrument_standalone_single
                     instrument_standalone_single()
         
         except Exception as e:
@@ -368,9 +370,11 @@ def agent():
     if write_file(home, home.lower(), whatap_home):
         os.environ['WHATAP_HOME'] = whatap_home
         
-        # t = threading.Thread(target=go)
-        # t.setDaemon(True)
-        # t.start()
+        whatap_code_start = preview_whatap_conf("whatap_code_start")
+        if whatap_code_start == 'true':
+            t = threading.Thread(target=go)
+            t.setDaemon(True)
+            t.start()
         config(home)
 
 ARCH = {
@@ -449,9 +453,9 @@ def go(batch=False, opts={}):
 
 import signal
 
-from whatap.trace.mod.application_wsgi import interceptor, start_interceptor, \
+from whatap.trace.mod.application.wsgi import interceptor, start_interceptor, \
     end_interceptor, trace_handler, interceptor_step_error
-from whatap.trace.mod.application_fastapi import interceptor_error_log
+from whatap.trace.mod.application.fastapi import interceptor_error_log
 from whatap.trace.trace_context import TraceContext, TraceContextManager
 
 def register_app(fn):

whatap_python-1.8.8/whatap/build.py

@@ -0,0 +1,4 @@
+app = 'Python'
+name = 'whatap-python'
+version = '1.8.8'
+release_date = '20250804'

{whatap_python-1.8.6 → whatap_python-1.8.8}/whatap/conf/configuration.py

@@ -1,8 +1,10 @@
 Configuration = {
     "dev": False,
+    "whatap_code_start": False,
     "ignore_whatap_stdout" : False,
     "net_udp_port": "6600",
     "web_static_content_extensions": "js, htm, html, gif, png, jpg, css, swf, ico",
+
     "trace_auto_normalize_enabled": True,
     "trace_user_enabled": True,
     "trace_user_using_ip": True,
@@ -14,6 +16,8 @@ Configuration = {
     "trace_ignore_url_prefix": None,
     "trace_websocket_enabled": False,
 
+    "trace_llm_log_enabled": False,
+
     "debug": False,
     "query_string_enabled": False,
     "query_string_urls": "",

whatap_python-1.8.8/whatap/counter/__init__.py

@@ -0,0 +1,9 @@
+from .counter_manager import CounterMgr  # CounterMgr 클래스 import
+from whatap import preview_whatap_conf
+
+open_file_descriptor_enabled = preview_whatap_conf("open_file_descriptor_enabled")
+
+if open_file_descriptor_enabled != 'false':
+    mgr = CounterMgr()
+    mgr.setDaemon(True)
+    mgr.start()

whatap_python-1.8.6/whatap/trace/mod/amqp_kombu.py → whatap_python-1.8.8/whatap/trace/mod/amqp/kombu.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error, start_interceptor, end_interceptor
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.6/whatap/trace/mod/amqp_pika.py → whatap_python-1.8.8/whatap/trace/mod/amqp/pika.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error, start_interceptor, end_interceptor
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.6/whatap/trace/mod/application_bottle.py → whatap_python-1.8.8/whatap/trace/mod/application/bottle.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, \
     interceptor_error
 
 

whatap_python-1.8.6/whatap/trace/mod/application_celery.py → whatap_python-1.8.8/whatap/trace/mod/application/celery.py

@@ -1,7 +1,7 @@
 from functools import wraps
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager
-from whatap.trace.mod.application_wsgi import start_interceptor, end_interceptor, interceptor_step_error
+from whatap.trace.mod.application.wsgi import start_interceptor, end_interceptor, interceptor_step_error
 from whatap import logging
 from whatap.conf.configure import Configure as conf
 import time

whatap_python-1.8.6/whatap/trace/mod/application_cherrypy.py → whatap_python-1.8.8/whatap/trace/mod/application/cherrypy.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, \
     interceptor_error
 
 

whatap_python-1.8.6/whatap/trace/mod/application_django.py → whatap_python-1.8.8/whatap/trace/mod/application/django.py

@@ -1,7 +1,7 @@
 from whatap.conf.configure import Configure as conf
 from whatap.net.packet_type_enum import PacketTypeEnum
 import whatap.net.async_sender as async_sender
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, \
     interceptor_error, interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.trace.trace_context import TraceContext
@@ -76,7 +76,7 @@ def instrument_asgi(module):
     module.ASGIHandler.__call__ = wrapper(module.ASGIHandler.__call__)
 
 try:
-    from whatap.trace.mod.application_django_py3 import \
+    from whatap.trace.mod.application.django_py3 import \
         instrument_handlers_async, interceptor_async,\
         trace_handler_async, blocking_handler_async,\
         parseHeaders as parseHeadersAsync,\
@@ -84,7 +84,7 @@ try:
     
     django_py3_loaded = True
 except Exception as e:
-    print("application_django error:",e)
+    print("application.django error:",e)
     django_py3_loaded = False
 
 def instrument_handlers_channels(module):

whatap_python-1.8.6/whatap/trace/mod/application_django_asgi.py → whatap_python-1.8.8/whatap/trace/mod/application/django_asgi.py

@@ -4,7 +4,7 @@ from whatap.conf.configure import Configure as conf
 from whatap.net import async_sender
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.trace.trace_context import TraceContext
-from whatap.trace.mod.application_wsgi import isIgnore, start_interceptor, end_interceptor
+from whatap.trace.mod.application.wsgi import isIgnore, start_interceptor, end_interceptor
 from whatap.util.hash_util import HashUtil as hash_util
 from whatap.util.userid_util import UseridUtil
 from whatap.util.date_util import DateUtil

whatap_python-1.8.6/whatap/trace/mod/application_django_py3.py → whatap_python-1.8.8/whatap/trace/mod/application/django_py3.py

@@ -2,7 +2,7 @@
 from whatap.conf.configure import Configure as conf
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.trace.trace_context import TraceContext
-from whatap.trace.mod.application_wsgi import \
+from whatap.trace.mod.application.wsgi import \
     interceptor_error,isIgnore, start_interceptor, end_interceptor
 from whatap.util.hash_util import HashUtil as hash_util
 from whatap.util.userid_util import UseridUtil

whatap_python-1.8.6/whatap/trace/mod/application_fastapi.py → whatap_python-1.8.8/whatap/trace/mod/application/fastapi.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_error, start_interceptor, end_interceptor, \
     isIgnore, interceptor_step_error
 from copy import copy

whatap_python-1.8.6/whatap/trace/mod/application_flask.py → whatap_python-1.8.8/whatap/trace/mod/application/flask.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, \
     interceptor_error
 from whatap.trace.trace_context_manager import TraceContextManager
 

whatap_python-1.8.6/whatap/trace/mod/application_frappe.py → whatap_python-1.8.8/whatap/trace/mod/application/frappe.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_error, start_interceptor, isIgnore, \
     end_interceptor
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.6/whatap/trace/mod/application_graphql.py → whatap_python-1.8.8/whatap/trace/mod/application/graphql.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error, start_interceptor, end_interceptor
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.6/whatap/trace/mod/application_nameko.py → whatap_python-1.8.8/whatap/trace/mod/application/nameko.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error, start_interceptor, end_interceptor
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.6/whatap/trace/mod/application_odoo.py → whatap_python-1.8.8/whatap/trace/mod/application/odoo.py

@@ -1,5 +1,5 @@
 import traceback
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, interceptor_error
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, interceptor_error
 from whatap.trace.trace_context_manager import TraceContextManager
 
 

whatap_python-1.8.6/whatap/trace/mod/application_starlette.py → whatap_python-1.8.8/whatap/trace/mod/application/starlette.py

@@ -4,7 +4,7 @@ from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.net.packet_type_enum import PacketTypeEnum
 from whatap.util.date_util import DateUtil
 from whatap.util.userid_util import UseridUtil as userid_util
-from whatap.trace.mod.application_wsgi import interceptor_step_error, \
+from whatap.trace.mod.application.wsgi import interceptor_step_error, \
 start_interceptor,end_interceptor
 from whatap.conf.configure import Configure as conf
 from typing import Any

whatap_python-1.8.6/whatap/trace/mod/application_tornado.py → whatap_python-1.8.8/whatap/trace/mod/application/tornado.py

@@ -6,7 +6,7 @@ from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.util.date_util import DateUtil
 from whatap.conf.configure import Configure as conf
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     start_interceptor, end_interceptor, interceptor_error, isIgnore
 
 

whatap_python-1.8.6/whatap/trace/mod/database_cxoracle.py → whatap_python-1.8.8/whatap/trace/mod/database/cxoracle.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
 db_info = {}

whatap_python-1.8.6/whatap/trace/mod/database_mongo.py → whatap_python-1.8.8/whatap/trace/mod/database/mongo.py

@@ -1,6 +1,6 @@
 import pymongo.monitoring
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 import whatap.net.async_sender as async_sender

whatap_python-1.8.6/whatap/trace/mod/database_mysql.py → whatap_python-1.8.8/whatap/trace/mod/database/mysql.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
 db_info = {}

whatap_python-1.8.6/whatap/trace/mod/database_neo4j.py → whatap_python-1.8.8/whatap/trace/mod/database/neo4j.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import (
+from whatap.trace.mod.application.wsgi import (
     trace_handler,
     interceptor_db_con,
     interceptor_db_execute,

whatap_python-1.8.6/whatap/trace/mod/database_postgresql.py → whatap_python-1.8.8/whatap/trace/mod/database/postgresql.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
 db_info = {}

whatap_python-1.8.6/whatap/trace/mod/database_redis.py → whatap_python-1.8.8/whatap/trace/mod/database/redis.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, interceptor_step_error
+from whatap.trace.mod.application.wsgi import trace_handler, interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 import whatap.net.async_sender as async_sender
 from whatap.net.packet_type_enum import PacketTypeEnum

whatap_python-1.8.6/whatap/trace/mod/database_toolkit.py → whatap_python-1.8.8/whatap/trace/mod/database/toolkit.py

@@ -1,6 +1,6 @@
 from whatap.net.packet_type_enum import PacketTypeEnum
 import whatap.net.async_sender as async_sender
-from whatap.trace.mod.application_wsgi import trace_handler, interceptor_db_execute, interceptor_step_error, sendDebugProfile
+from whatap.trace.mod.application.wsgi import trace_handler, interceptor_db_execute, interceptor_step_error, sendDebugProfile
 from whatap.util.date_util import DateUtil
 from whatap.trace.trace_context_manager import TraceContextManager
 import sys

whatap_python-1.8.6/whatap/trace/mod/email_smtp.py → whatap_python-1.8.8/whatap/trace/mod/email/smtp.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 import whatap.net.async_sender as async_sender

whatap_python-1.8.6/whatap/trace/mod/httpc_django.py → whatap_python-1.8.8/whatap/trace/mod/httpc/django.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import transfer, trace_handler, \
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
     interceptor_httpc_request
 
 

whatap_python-1.8.6/whatap/trace/mod/httpc_httplib.py → whatap_python-1.8.8/whatap/trace/mod/httpc/httplib.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import transfer, trace_handler, \
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
     interceptor_httpc_request, interceptor_sock_connect
 
 request_injection_processed = False

whatap_python-1.8.8/whatap/trace/mod/httpc/httpx.py

@@ -0,0 +1,24 @@
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
+    interceptor_httpc_request
+
+
+def instrument_httpx(module):
+    def wrapper(fn):
+        @trace_handler(fn)
+        def trace(*args, **kwargs):
+            request = args[1]
+            request.headers = transfer(request.headers)
+
+            httpc_url = str(request.url)
+            callback = interceptor_httpc_request(fn, httpc_url, *args, **kwargs)
+
+            return callback
+
+        return trace
+
+    if hasattr(module, 'Client') and hasattr(module.Client, 'send'):
+        module.Client.send = wrapper(module.Client.send)
+
+
+    if hasattr(module, 'AsyncClient') and hasattr(module.AsyncClient, 'send'):
+        module.AsyncClient.send = wrapper(module.AsyncClient.send)

whatap_python-1.8.6/whatap/trace/mod/httpc_requests.py → whatap_python-1.8.8/whatap/trace/mod/httpc/requests.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import transfer, trace_handler, \
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
     interceptor_httpc_request
 
 

whatap_python-1.8.6/whatap/trace/mod/httpc_urllib3.py → whatap_python-1.8.8/whatap/trace/mod/httpc/urllib3.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import transfer, interceptor_httpc_request, \
+from whatap.trace.mod.application.wsgi import transfer, interceptor_httpc_request, \
     trace_handler, interceptor_sock_connect
 
 

whatap_python-1.8.8/whatap/trace/mod/llm/openai.py

@@ -0,0 +1,199 @@
+import socket
+import logging
+
+from openai import OpenAIError
+
+from whatap import DateUtil, conf
+from whatap.pack import logSinkPack
+from whatap.trace.trace_context_manager import TraceContextManager
+from whatap.trace.mod.application.wsgi import trace_handler
+
+import whatap.io as whatapio
+import whatap.net.async_sender as async_sender
+
+
+def __send_llm_pack(metadata):
+    try:
+        ctx = TraceContextManager.getLocalContext()
+
+        input_text = metadata.get("input_text", "")
+        output_text = metadata.get("output_text", "")
+        content = f"[REQUEST]{input_text}\n[RESPONSE]{output_text}"
+
+        tags = {'@txid': str(ctx.id)} if ctx else {}
+        fields = {}
+
+        # 1. 기본 LLM 팩 데이터 구성
+        llm_tags = {
+            'ip': metadata.get('ip'),
+            'host_name': metadata.get('host_name'),
+            'model': metadata.get('model'),
+            'stream': str(metadata.get('stream', False)),
+            'success': str(metadata.get('success', False))
+        }
+        tags.update(llm_tags)
+
+        llm_fields = {
+            'prompt_tokens': metadata.get('prompt_tokens'),
+            'completion_tokens': metadata.get('completion_tokens'),
+            'total_tokens': metadata.get('total_tokens'),
+        }
+
+        fields.update(llm_fields)
+
+        # 2. 에러 데이터 팩인지 확인
+        if (metadata.get('error_type') == 'api_error'):
+            error_fields = {
+                "error": metadata.get('error'),
+                "error_type": "api_error",
+            }
+            fields.update(error_fields)
+
+        elif (metadata.get('error_type') == 'program_error'):
+            error_fields = {
+                "error": metadata.get('error'),
+                "error_type": "program_error",
+            }
+            fields.update(error_fields)
+
+        # 3. value 가 None 이 아닌 것들로 tags,fields 재구성
+        tags = {k: v for k, v in tags.items() if v is not None}
+        fields = {k: v for k, v in fields.items() if v is not None}
+
+        p = logSinkPack.getLogSinkPack(
+            t=DateUtil.now(),
+            category="LLMResponse",
+            tags=tags,
+            fields=fields,
+            line=DateUtil.now(),
+            content=content
+        )
+
+        p.pcode = conf.PCODE
+        bout = whatapio.DataOutputX()
+        bout.writePack(p, None)
+        packbytes = bout.toByteArray()
+        try:
+            async_sender.send_relaypack(packbytes)
+        except Exception as e:
+            logging.debug(str(e))
+            pass
+
+    except Exception as e:
+        logging.debug(str(e))
+        pass
+
+
+def __streaming_response_wrapper(response_stream, metadata, prompt_tokens):
+    collected_text = ""
+    is_first_chunk = True
+    #TODO
+    """ 
+    스트리밍 경우인 경우, completion_tokens 의 개수를 가져올 수 없기 때문에 토큰 계산 모듈을 통해, 추출하는 방법밖에 없음.
+    현재 관련 로직에 대해서 개발된 바가 없기에 0으로 제공중임.
+    """
+    completion_tokens = 0
+    try:
+        for chunk in response_stream:
+            if is_first_chunk:
+                is_first_chunk = False
+
+            delta = chunk.choices[0].delta
+            content = getattr(delta, "content", None) or ""
+            collected_text += content
+            yield chunk
+    finally:
+        metadata.update({
+            "completion_tokens": completion_tokens,
+            "total_tokens": prompt_tokens + completion_tokens,
+            "output_text": collected_text,
+            "success": True,
+        })
+        __send_llm_pack(metadata)
+
+
+def intercept_create(fn, *args, **kwargs):
+    prompt_messages = kwargs.get("messages", [])
+    model_name = kwargs.get("model")
+    stream_flag = kwargs.get("stream", False)
+
+
+    input_text = "".join([msg.get("content", "") or "" for msg in prompt_messages])
+
+
+    metadata = {
+        "ip": socket.gethostbyname(socket.gethostname()),
+        "host_name": socket.gethostname(),
+        "model": model_name,
+        "input_text": input_text,
+        "stream": stream_flag,
+    }
+
+    try:
+        response = fn(*args, **kwargs)
+
+        usage = getattr(response, "usage", None)
+        prompt_tokens = getattr(usage, "prompt_tokens", 0)
+        completion_tokens = getattr(usage, "completion_tokens", 0)
+
+    except OpenAIError as api_err:
+        metadata.update({
+            "success": False,
+            "error": str(api_err),
+            "error_type": "api_error"
+        })
+        __send_llm_pack(metadata)
+        raise api_err
+
+    except Exception as code_err:
+        metadata.update({
+            "success": False,
+            "error": str(code_err),
+            "error_type": "program_error"
+        })
+        __send_llm_pack(metadata)
+        raise code_err
+
+    if stream_flag:
+        return __streaming_response_wrapper(response, metadata, prompt_tokens)
+
+    try:
+        response_text = "".join([choice.message.content or "" for choice in response.choices])
+    except Exception as e:
+        raise e
+
+    metadata.update({
+        "prompt_tokens": prompt_tokens,
+        "completion_tokens": completion_tokens,
+        "total_tokens": prompt_tokens + completion_tokens,
+        "output_text": response_text,
+        "success": True,
+    })
+    __send_llm_pack(metadata)
+
+    if not hasattr(response, "choices"):
+        logging.debug("The returned object doesn't have attribute which is 'choices'")
+
+    return response
+
+
+def instrument_openai(module):
+
+    if not (conf.trace_llm_log_enabled):
+        return
+
+    def create_wrapper(fn):
+        @trace_handler(fn)
+        def trace(*args, **kwargs):
+            return intercept_create(fn, *args, **kwargs)
+
+        return trace
+
+
+    if (hasattr(module, 'resources') and
+            hasattr(module.resources, 'chat') and
+            hasattr(module.resources.chat, 'completions') and
+            hasattr(module.resources.chat.completions, 'Completions') and
+            hasattr(module.resources.chat.completions.Completions, 'create')):
+        original_create = module.resources.chat.completions.Completions.create
+        module.resources.chat.completions.Completions.create = create_wrapper(original_create)

{whatap_python-1.8.6 → whatap_python-1.8.8}/whatap/trace/mod/plugin.py

@@ -2,7 +2,7 @@ import inspect
 from whatap.net.packet_type_enum import PacketTypeEnum
 import whatap.net.async_sender as async_sender
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler
+from whatap.trace.mod.application.wsgi import trace_handler
 from whatap.util.date_util import DateUtil
 from whatap.trace.trace_context_manager import TraceContextManager
 

whatap_python-1.8.6/whatap/trace/mod/standalone_multiple.py → whatap_python-1.8.8/whatap/trace/mod/standalone/multiple.py

@@ -12,7 +12,7 @@ from whatap.util.date_util import DateUtil
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.net.packet_type_enum import PacketTypeEnum
-from whatap.trace.mod.application_wsgi import trace_handler
+from whatap.trace.mod.application.wsgi import trace_handler
 from whatap import logging
 
 def trace_handler(fn, start=False, preload=None):