whatap-python 1.8.8__tar.gz → 1.8.9.post0__tar.gz

{whatap_python-1.8.8 → whatap_python-1.8.9.post0}/PKG-INFO

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

whatap_python-1.8.9.post0/whatap/build.py

@@ -0,0 +1,4 @@
+app = 'Python'
+name = 'whatap-python'
+version = '1.8.9.post0'
+release_date = '20250813'

{whatap_python-1.8.8 → whatap_python-1.8.9.post0}/whatap/trace/mod/application/wsgi.py

@@ -403,11 +403,17 @@ def interceptor_db_con(fn, db_info, *args, **kwargs):
         kwargs = dict(
             x.split('=') for x in re.sub(r'\s*=\s*', '=', args[0]).split())
 
-    text = '{}://'.format(db_info.get('type'))
-    text += kwargs.get('user' , '')
-    text += "@"
-    text += kwargs.get('host', kwargs.get('dsn', ''))
-    text += '/'
+    db_type = db_info.get('type')
+
+    if db_type == "sqlite":
+        text = "sqlite:"
+    else:
+        text = '{}://'.format(db_type)
+        text += kwargs.get('user', '')
+        text += "@"
+        text += kwargs.get('host', kwargs.get('dsn', ''))
+        text += '/'
+
     text += kwargs.get('database', kwargs.get('db', kwargs.get('dbname', '')))
     ctx.active_dbc = text
     ctx.lctx['dbc'] = text
@@ -445,14 +451,58 @@ def addQuoteList(arg_list):
     return tuple(quoted_list)
 
 def neo4jQuery(query,paremeter):
-    transformed_query = query
+    neo4j_query = query
 
     for key, value in paremeter.items():
         placeholder = f"${key}"
         replacement = f"'{str(value)}'"
-        transformed_query = transformed_query.replace(placeholder, replacement)
-
-    return transformed_query
+        neo4j_query = neo4j_query.replace(placeholder, replacement)
+
+    return neo4j_query
+
+def sqliteQuery(query, paremeter):
+    sqlite_query = query
+
+    def quote(v):
+        if v is None: return "NULL"
+        if isinstance(v, (bytes, bytearray)): return "X'" + v.hex() + "'"
+        return "'" + str(v).replace("'", "''") + "'"
+
+    # 이름 기반: :name / @name / $name (단일 세트)
+    if isinstance(paremeter, dict):
+        for pfx in (':', '@', '$'):
+            for k, v in paremeter.items():
+                sqlite_query = sqlite_query.replace(f"{pfx}{k}", quote(v))
+        return sqlite_query
+
+    # 포지셔널 + executemany 분기
+    if isinstance(paremeter, (list, tuple)):
+        # ── executemany: [tuple|dict, ...] ──
+        if isinstance(paremeter, list) and paremeter and isinstance(paremeter[0], (tuple, dict)):
+            stmts = []
+            for params in paremeter:
+                sqlite_query = query
+                if isinstance(params, dict):
+                    for pfx in (':', '@', '$'):
+                        for k, v in params.items():
+                            sqlite_query = sqlite_query.replace(f"{pfx}{k}", quote(v))
+                else:  # tuple
+                    for i, v in enumerate(params, 1):
+                        sqlite_query = sqlite_query.replace(f"?{i}", quote(v))
+                    for v in params:
+                        sqlite_query = sqlite_query.replace('?', quote(v), 1)
+                stmts.append(sqlite_query)
+            return ";\n".join(stmts)
+
+        # ── 단일 포지셔널 세트 (tuple 또는 스칼라 list) ──
+        seq = paremeter if isinstance(paremeter, tuple) else tuple(paremeter)
+        for i, v in enumerate(seq, 1):
+            sqlite_query = sqlite_query.replace(f"?{i}", quote(v))
+        for v in seq:
+            sqlite_query = sqlite_query.replace('?', quote(v), 1)
+        return sqlite_query
+
+    return sqlite_query
 
 def interceptor_db_execute(fn, db_info, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
@@ -466,6 +516,13 @@ def interceptor_db_execute(fn, db_info, *args, **kwargs):
             query = neo4jQuery(args[1], kwargs)
         except Exception as e:
             pass
+
+    elif db_type == "sqlite" and len(args) > 2:
+        try:
+            query = sqliteQuery(args[1],args[2])
+        except Exception as e:
+            pass
+
     else:
         if len(args) > 2 and type(args[2]) == dict and args[2]:
             try:
@@ -486,24 +543,6 @@ def interceptor_db_execute(fn, db_info, *args, **kwargs):
     if not query:
         return fn(*args, **kwargs)
 
-    start_time = DateUtil.nowSystem()
-    ctx.start_time = start_time
-
-    text = '{}://'.format(db_info.get('type'))
-    text += db_info.get('user' , '')
-    text += "@"
-    text += db_info.get('host', db_info.get('dsn', ''))
-    text += '/'
-    text += db_info.get('database', db_info.get('db', db_info.get('dbname', '')))
-    ctx.active_dbc = text
-    ctx.lctx['dbc'] = text
-
-    ctx.active_dbc = 0
-
-    datas = [text]
-    ctx.elapsed = DateUtil.nowSystem() - start_time
-    async_sender.send_packet(PacketTypeEnum.TX_DB_CONN, ctx, datas)
-
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
     ctx.active_sqlhash = query

whatap_python-1.8.9.post0/whatap/trace/mod/database/sqlite3.py

@@ -0,0 +1,130 @@
+from whatap.trace.mod.application.wsgi import trace_handler, \
+    interceptor_db_con, interceptor_db_execute, interceptor_db_close
+
+class CursorProxy:
+    def __init__(self, real_cursor, db_info):
+        self._cur = real_cursor
+        self._db_info = db_info
+
+    def execute_wrapper(self, original_execute_method):
+        owner = getattr(original_execute_method, "__self__", None)
+
+        def safe_execute(*args, **kwargs):
+            if args and owner is not None and args[0] is owner:
+                args = args[1:]
+            return original_execute_method(*args, **kwargs)
+
+        return safe_execute
+
+    def execute(self, *args, **kwargs):
+        safe_fn = self.execute_wrapper(self._cur.execute)
+        callback = interceptor_db_execute(safe_fn, self._db_info, self._cur, *args, **kwargs)
+        return callback
+
+    def executemany(self, *args, **kwargs):
+        safe_fn = self.execute_wrapper(self._cur.executemany)
+        callback = interceptor_db_execute(safe_fn, self._db_info, self._cur, *args, **kwargs)
+        return callback
+
+    def close(self, *args, **kwargs):
+        callback = self._cur.close(*args, **kwargs)
+        return callback
+
+    def __enter__(self):
+        self._cur.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return self._cur.__exit__(exc_type, exc_val, exc_tb)
+
+    def __getattr__(self, name):
+        return getattr(self._cur, name)
+
+    def __setattr__(self, name, value):
+        if name.startswith('_'):
+            super().__setattr__(name, value)
+        else:
+            setattr(self._cur, name, value)
+
+class ConnectionProxy:
+    def __init__(self, real_connection, db_info):
+        self._real_connection = real_connection
+        self._db_info = db_info
+
+    def execute_wrapper(self, original_execute_method):
+        owner = getattr(original_execute_method, "__self__", None)
+
+        def safe_execute(*args, **kwargs):
+            if args and owner is not None and args[0] is owner:
+                args = args[1:]
+            return original_execute_method(*args, **kwargs)
+
+        return safe_execute
+
+    def execute(self, *args, **kwargs):
+        real_cursor = self._real_connection.cursor()
+        safe_fn = self.execute_wrapper(real_cursor.execute)
+        callback = interceptor_db_execute(safe_fn,self._db_info,real_cursor,*args,**kwargs)
+        return callback
+
+    def executemany(self, *args, **kwargs):
+        real_cursor = self._real_connection.cursor()
+        safe_fn = self.execute_wrapper(real_cursor.executemany)
+        callback = interceptor_db_execute(safe_fn, self._db_info, real_cursor, *args, **kwargs)
+        return callback
+
+    def executescript(self, *args, **kwargs):
+        real_cursor = self._real_connection.cursor()
+        safe_fn = self.execute_wrapper(real_cursor.executescript)
+        callback = interceptor_db_execute(safe_fn, self._db_info, real_cursor, *args, **kwargs)
+        return callback
+
+    def cursor(self, *args, **kwargs):
+        real_cursor = self._real_connection.cursor(*args, **kwargs)
+        return CursorProxy(real_cursor, self._db_info)
+
+    def close(self, *args, **kwargs):
+        callback = interceptor_db_close(self._real_connection.close, *args, **kwargs)
+        return callback
+
+    def __getattr__(self, name):
+        return getattr(self._real_connection, name)
+
+    def __enter__(self):
+        self._real_connection.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return self._real_connection.__exit__(exc_type, exc_val, exc_tb)
+
+    def __setattr__(self, name, value):
+        if name.startswith('_'):
+            super().__setattr__(name, value)
+        else:
+            setattr(self._real_connection, name, value)
+
+
+def instrument_sqlite3(module):
+
+    def wrapper(fn):
+        @trace_handler(fn)
+        def trace(*args, **kwargs):
+            if args:
+                kwargs['database'] = args[0]
+                args = args[1:]
+
+            db_name = kwargs.get('database', 'unknown')
+            db_info = {'type': 'sqlite', 'db': db_name}
+            db_info.update(kwargs)
+
+            real_connection = interceptor_db_con(fn, db_info, *args, **kwargs)
+
+            if real_connection:
+                return ConnectionProxy(real_connection, db_info)
+
+            return real_connection
+
+        return trace
+
+    if hasattr(module, "connect"):
+        module.connect = wrapper(module.connect)

{whatap_python-1.8.8 → whatap_python-1.8.9.post0}/whatap/trace/trace_module_definition.py

@@ -11,6 +11,21 @@ DEFINITION = {
         ('', 'instrument_standalone_single'),
         ('', 'instrument_standalone_multiple')
     ],
+    'email.smtp': [
+        ('smtplib', 'instrument_smtp'),
+    ],
+    'amqp.pika': [
+        ('pika.channel', 'instrument_pika'),
+    ],
+    'llm.openai': [
+        ('openai', 'instrument_openai')
+    ],
+    'logging': [
+        ('logging.handlers', 'instrument_logging'),
+        ('loguru._handler', 'instrument_loguru'),
+    ],
+
+
     'httpc.httplib': [
         ('httplib', 'instrument_httplib'),
         ('http.client', 'instrument_httplib'),
@@ -28,6 +43,8 @@ DEFINITION = {
     'httpc.httpx' : [
         ('httpx', 'instrument_httpx')
     ],
+
+
     'database.mysql': [
         ('MySQLdb', 'instrument_MySQLdb'),
         ('MySQLdb.cursors', 'instrument_MySQLdb_cursors'),
@@ -42,12 +59,26 @@ DEFINITION = {
     'database.neo4j': [
         ('neo4j', 'instrument_neo4j')
     ],
+    'database.sqlite3': [
+        ('sqlite3', 'instrument_sqlite3')
+    ],
+    'database.cxoracle':[
+        ('cx_Oracle', 'instrument_oracle_client'),
+    ],
+    'database.redis': [
+        ('redis', 'instrument_redis_connection'),
+    ],
+    'database.mongo': [
+        ('pymongo', 'instrument_mongo_client'),
+    ],
     'database.toolkit': [
         ('sqlalchemy.orm.session', 'instrument_sqlalchemy'),
         ('sqlalchemy.engine.default', 'instrument_sqlalchemy_engine'),
         ('sqlalchemy.engine.create', 'instrument_sqlalchemy_engine_basic'),
         ('sqlalchemy.engine', 'instrument_sqlalchemy_engine_basic'),
     ],
+
+
     'application.starlette' : [
         ('starlette.websockets' , 'instrument_starlette_websocket'),
     ],
@@ -88,15 +119,6 @@ DEFINITION = {
         ('celery.task.trace', 'instrument_celery_execute_trace'),
         ('celery.app.trace', 'instrument_celery_execute_trace'),
     ],
-    'database.redis':[
-        ('redis','instrument_redis_connection'),
-    ],
-    'email.smtp':[
-        ('smtplib','instrument_smtp'),
-    ],
-    'amqp.pika':[
-        ('pika.channel','instrument_pika'),
-    ],
     'application.nameko': [
         ('nameko.containers', 'instrument_nameko_spawn_worker'),
         ('spsengine.containers', 'instrument_nameko_spawn_worker'),
@@ -108,13 +130,6 @@ DEFINITION = {
         #graphen-core 2.x
         ('graphql.execution.executor','instrument_graphql'),
     ],
-    'database.mongo':[
-        ('pymongo','instrument_mongo_client'),
-    ],
-    'logging':[
-        ('logging.handlers', 'instrument_logging'),
-        ('loguru._handler','instrument_loguru'),
-    ],
     'application.fastapi': [
         ('fastapi.applications', 'instrument_applications'),
         ('fastapi.routing', 'instrument'),
@@ -127,10 +142,4 @@ DEFINITION = {
     'application.odoo': [
         ('odoo', 'instrument'),
     ],
-    'database.cxoracle':[
-        ('cx_Oracle', 'instrument_oracle_client'),
-    ],
-    'llm.openai':[
-        ('openai' , 'instrument_openai')
-    ]
 }

{whatap_python-1.8.8 → whatap_python-1.8.9.post0}/whatap_python.egg-info/PKG-INFO

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

{whatap_python-1.8.8 → whatap_python-1.8.9.post0}/whatap_python.egg-info/SOURCES.txt

@@ -74,6 +74,7 @@ whatap/trace/mod/database/mysql.py
 whatap/trace/mod/database/neo4j.py
 whatap/trace/mod/database/postgresql.py
 whatap/trace/mod/database/redis.py
+whatap/trace/mod/database/sqlite3.py
 whatap/trace/mod/database/toolkit.py
 whatap/trace/mod/email/__init__.py
 whatap/trace/mod/email/smtp.py

whatap_python-1.8.8/whatap/build.py

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