whatap-python 1.8.5__tar.gz → 1.8.14__tar.gz

{whatap_python-1.8.5 → whatap_python-1.8.14}/PKG-INFO

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

{whatap_python-1.8.5 → whatap_python-1.8.14}/setup.py

@@ -18,7 +18,7 @@ setup(name=build.name,
       author_email='admin@whatap.io',
       license='Whatap License',
       url='https://www.whatap.io',
-      packages=find_packages(),
+      packages=find_packages(exclude=('sample','sample.*')),
       package_data={
           'whatap': ['LICENSE', '*.rst', '*.conf', '*.json', 'agent/*/*/whatap_python']
       },

{whatap_python-1.8.5 → whatap_python-1.8.14}/whatap/__init__.py

@@ -48,33 +48,41 @@ LOG_FILE_NAME = 'whatap-hook.log'
 
 isFrappeCommands = "get-frappe-commands" in sys.argv if hasattr(sys, "argv") else False
 
-def read_ignore_whatap_stdout():
-    ignore_whatap_stdout = 'false'
+def preview_whatap_conf(option_name:str):
     home = os.environ.get('WHATAP_HOME', '.')
     whatap_config = os.path.join(home, 'whatap.conf')
+
+
+    """
+    현재 preview_whatap_conf 를 사용중인 옵션
+    - ignore_whatap_stdout (False)
+    - standalone_enabled (False)
+    - counter_thread_enabled (False)
+    """
+    value = 'false'
     try:
         with open(whatap_config) as f:
             for raw in f:
                 line = raw.strip()
                 if not line or line.startswith('#'):
                     continue
-                if line.startswith('ignore_whatap_stdout'):
+                if line.startswith(option_name):
                     parts = line.split('=', 1)
                     if len(parts) == 2:
-                        ignore_whatap_stdout = parts[1].strip()
+                        value = parts[1].strip()
                     break
-        return ignore_whatap_stdout
+        return value
 
     except FileNotFoundError:
-        return ignore_whatap_stdout
+        return value
 
     except Exception as e:
         print(f'WHATAP: config parse error ({e!r})')
-        return ignore_whatap_stdout
+        return value
 
 
 
-ignore_whatap_stdout = read_ignore_whatap_stdout()
+ignore_whatap_stdout = preview_whatap_conf("ignore_whatap_stdout")
 
 
 
@@ -329,6 +337,14 @@ def hooks(home):
                                                       'trace',
                                                       'mod',
                                                       key)}
+
+            if conf.standalone_enabled:
+                if conf.standalone_type == 'multiple-transaction':
+                    from whatap.trace.mod.standalone.multiple import instrument_standalone_multiple
+                    instrument_standalone_multiple()
+                else:
+                    from whatap.trace.mod.standalone.single import instrument_standalone_single
+                    instrument_standalone_single()
         
         except Exception as e:
             logging.debug(e, extra={'id': 'PLUGIN ERROR'})
@@ -354,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 = {
@@ -435,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.14/whatap/build.py

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

{whatap_python-1.8.5 → whatap_python-1.8.14}/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": "",
@@ -50,6 +54,10 @@ Configuration = {
 	"stat_error_max_count": 1000,
 	"stat_useragent_max_count": 500,
 
+    "standalone_enabled" : False,
+    "standalone_type" : "single-transaction",
+    "standalone_transaction_patterns" : "",
+
     "user_header_ticket_enabled": False,
     "user_header_ticket":"",
     "trace_user_cookie_limit":2048,
@@ -207,6 +215,9 @@ Configuration = {
     "log_unhandled_exception": 'false',
     "threadstack_faulthandler": False,
     "max_send_queue_size": 1000,
-    "open_file_descriptor_enabled":False,
+    "open_file_descriptor_enabled": False,
     "open_file_descriptor_interval":60,
+    "counter_thread_enabled": False,
+    "llm_stat_enabled" : False,
+    "llm_stat_interval" : 5
 }

whatap_python-1.8.14/whatap/counter/__init__.py

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

{whatap_python-1.8.5 → whatap_python-1.8.14}/whatap/counter/counter_manager.py

@@ -3,20 +3,27 @@ import time
 import logging
 from threading import Thread
 from .tasks.openfiledescriptor import OpenFileDescriptorTask
+from .tasks.llm_stat import LLMStatTask
 
 #현재 디렉토리 아래 tasks 가 있고 그안의 openfiledescriptor.py 파일에  OpenFileDescriptorTask 클래스를 import 하고싶어.
 
 class CounterMgr(Thread):
+    _instance = None
     def __init__(self):
         super(CounterMgr, self).__init__()  # Thread 초기화
         self.tasks = list()
         self.last_executed = {}  # 각 task의 마지막 실행 시간을 기록하기 위한 딕셔너리
-        
+        CounterMgr._instance = self
+
     def run(self):
-        # OpenFileDescriptorTask 인스턴스 생성 후 tasks에 추가
-        task = OpenFileDescriptorTask()
-        self.tasks.append(task)
-        self.last_executed[task.name()] = 0  # 각 task의 마지막 실행 시간을 초기화
+        ofd_task = OpenFileDescriptorTask()
+        self.tasks.append(ofd_task)
+        self.last_executed[ofd_task.name()] = 0  # 각 task의 마지막 실행 시간을 초기화
+
+        llm_task = LLMStatTask()
+        self.tasks.append(llm_task)
+        self.last_executed[llm_task.name()] = 0 # 각 task의 마지막 실행 시간을 초기화
+
         while True:
             current_time = time.time()  # 현재 시간을 초 단위로 가져옴
             time.sleep(1)  # 0.1초마다 확인 (부하 줄이기)

whatap_python-1.8.14/whatap/counter/tasks/llm_stat.py

@@ -0,0 +1,111 @@
+import whatap.net.async_sender as async_sender
+import whatap.io as whatapio
+from whatap.pack import tagCountPack
+from whatap.pack.tagCountPack import TagCountPack
+from whatap.util.hash_util import HashUtil
+from whatap import DateUtil
+
+import os
+import time
+from typing import List, Dict, Tuple
+from collections import defaultdict
+
+currentpid = os.getpid()
+
+
+class LLMStatTask:
+    def __init__(self):
+        self.llm_stats = {
+            'model_calls': defaultdict(int),
+            'model_prompt_tokens': defaultdict(int),
+            'model_completion_tokens': defaultdict(int)
+        }
+
+    def name(self):
+        return "LLMStatTask"
+
+    def interval(self):
+        from whatap.conf.configure import Configure as conf
+        return int(getattr(conf, 'llm_stat_interval', 5))
+
+    def process(self):
+        from whatap.conf.configure import Configure as conf
+        enabled = getattr(conf, 'llm_stat_enabled', False)
+        if not enabled:
+            return
+
+        stats = self.get_current_stats()
+
+        if not stats['model_calls']:
+            return
+
+        try:
+            p = TagCountPack()
+            p.time = DateUtil.now() // 1000 * 1000
+            p.Category = "llm_stat"
+            p.tags.putAuto("pid", currentpid)
+            p.tags.putAuto("!rectype", 2)
+
+            model_id_list = p.fields.newList("@id")
+            model_name_list = p.fields.newList("model_name")
+            call_count_list = p.fields.newList("call_count")
+            prompt_tokens_list = p.fields.newList("prompt_tokens")
+            completion_tokens_list = p.fields.newList("completion_tokens")
+            total_tokens_list = p.fields.newList("total_tokens")
+
+            for model_name, count in stats['model_calls'].items():
+                prompt_tokens = stats['model_prompt_tokens'][model_name]
+                completion_tokens = stats['model_completion_tokens'][model_name]
+                total_tokens = prompt_tokens + completion_tokens
+
+                model_id_list.addLong(HashUtil.hashFromString(model_name))
+                model_name_list.addString(model_name)
+                call_count_list.addLong(count)
+                prompt_tokens_list.addLong(prompt_tokens)
+                completion_tokens_list.addLong(completion_tokens)
+                total_tokens_list.addLong(total_tokens)
+
+
+            p.pcode = getattr(conf, 'PCODE', 0)
+            bout = whatapio.DataOutputX()
+            bout.writePack(p, None)
+            packbytes = bout.toByteArray()
+
+            async_sender.send_relaypack(packbytes)
+            self.reset_stats()
+
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+
+
+    def get_current_stats(self) -> Dict:
+        return {
+            'model_calls': dict(self.llm_stats['model_calls']),
+            'model_prompt_tokens': dict(self.llm_stats['model_prompt_tokens']),
+            'model_completion_tokens': dict(self.llm_stats['model_completion_tokens'])
+        }
+
+    def prepare_model_data(self, model_calls: Dict[str, int]) -> Tuple[List[str], List[int]]:
+        if not model_calls:
+            return [], []
+
+        models = list(model_calls.keys())
+        call_count = [model_calls[model] for model in models]
+
+        return models, call_count
+
+    def update_stats(self, prompt_tokens: int, completion_tokens: int,
+                     model_name: str):
+        self.llm_stats['model_calls'][model_name] += 1
+        self.llm_stats['model_prompt_tokens'][model_name] += prompt_tokens
+        self.llm_stats['model_completion_tokens'][model_name] += completion_tokens
+
+
+
+    def reset_stats(self):
+        self.llm_stats = {
+            'model_calls': defaultdict(int),
+            'model_prompt_tokens': defaultdict(int),
+            'model_completion_tokens': defaultdict(int)
+        }

{whatap_python-1.8.5 → whatap_python-1.8.14}/whatap/net/udp_session.py

@@ -212,9 +212,6 @@ class UdpSession(object):
                 datas.append(data)
 
             cls.send_packet(PacketTypeEnum.ACTIVE_STACK, None, datas)
-            stats = TraceContextManager.getActiveStats()
-            datas = [','.join([str(x) for x in stats])]
-            cls.send_packet(PacketTypeEnum.ACTIVE_STATS, None, datas)
         else:
             # param pack
             # format: "[packetType], [ctx], [datas: xxxx xxxx xxxx]"

{whatap_python-1.8.5 → whatap_python-1.8.14}/whatap/scripts/__init__.py

@@ -1,11 +1,12 @@
 import os
 import re
+import time
 from functools import wraps
 
 import sys, threading
 
 from whatap import check_whatap_home, ROOT_DIR, init_config, update_config, \
-    batch_agent, AGENT_NAME, go, configPort
+    batch_agent, AGENT_NAME, go, configPort, preview_whatap_conf
 
 
 def whatap_command(func):
@@ -73,6 +74,9 @@ def start_agent():
 
     try:
         go(opts={'whatap.port': str(port)})
+        standalone_enabled = preview_whatap_conf("standalone_enabled")
+        if standalone_enabled == 'true':
+            time.sleep(1)
     except Exception as e:
         print('WHATAP: AGENT ERROR: {}'.format(e))
         print('WHATAP: continue to start user application')

whatap_python-1.8.5/whatap/trace/mod/amqp_kombu.py → whatap_python-1.8.14/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.5/whatap/trace/mod/amqp_pika.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_bottle.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_celery.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_cherrypy.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_django.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_django_asgi.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_django_py3.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_fastapi.py → whatap_python-1.8.14/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
@@ -443,6 +443,7 @@ def instrument_applications(module):
         async def trace(instance, scope, receive, send):
             if scope["type"] != "http":
                 await fn(instance, scope, receive, send)
+                return
             TraceContext()
             try:
                 await fn(instance, scope, receive, send)

whatap_python-1.8.5/whatap/trace/mod/application_flask.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_frappe.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_graphql.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_nameko.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_odoo.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_starlette.py → whatap_python-1.8.14/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.5/whatap/trace/mod/application_tornado.py → whatap_python-1.8.14/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