test

Author: Y0rFa1se

loader.py

@@ -4,7 +4,6 @@
 
 from telegram.ext import Application, CommandHandler, CallbackQueryHandler
 
-
 def load_modules(app: Application):
     for py_file in Path("modules").glob("*.py"):
         module_name = py_file.stem
@@ -15,36 +14,41 @@ def load_modules(app: Application):
         module = importlib.util.module_from_spec(spec)
         spec.loader.exec_module(module)
 
-        functions = [name for name, obj in inspect.getmembers(module) if inspect.isfunction(obj) and not name.startswith("_")]
+        functions = []
+        for name, obj in inspect.getmembers(module):
+            if inspect.isfunction(obj) and not name.startswith("_"):
+                functions.append(name)
 
         decorator_groups = {"command": [], "callback": []}
 
         for func_name in functions:
             func = getattr(module, func_name)
 
-            if hasattr(func, "__wrapped__"):
-                decorator_name = func.__name__ if hasattr(func, "__name__") else "unknown"
-                original_func = func
-                while hasattr(original_func, "__wrapped__"):
-                    original_func = original_func.__wrapped__
-                decorator_name = original_func.__name__
+            if hasattr(func, "decorator"):
+                decorator_name = func.decorator
             else:
-                raise ValueError(f"No decorator found for function {func_name} in module {module_name}")
+                print(f"Function {func_name} in module {module_name} does not have a recognized decorator.")
+                continue
 
             if decorator_name not in decorator_groups:
-                raise ValueError(f"Decorator {decorator_name} not recognized in module {module_name}")
+                print(f"Decorator {decorator_name} not recognized in module {module_name}")
+                continue
 
             decorator_groups[decorator_name].append(func_name)
+
+        print(decorator_groups)
 
         for decorator_name, func_names in decorator_groups.items():
             if decorator_name == "command":
                 for func_name in func_names:
                     func = getattr(module, func_name)
 
                     app.add_handler(CommandHandler(func.command, func))
+                    print(f"Command handler for {func.command} added from module {module_name}")
 
             elif decorator_name == "callback":
                 for func_name in func_names:
                     func = getattr(module, func_name)
 
-                    app.add_handler(CallbackQueryHandler(func))
+                    app.add_handler(CallbackQueryHandler(func))
+                    print(f"Callback handler for {func.callback_data} added from module {module_name}")

modules/__example__.py

@@ -1,5 +1,5 @@
-from modules.__apis__ import *
-from modules.__decorators__ import command, callback
+from modules.apis import *
+from modules.decorators import command, callback
 
 from telegram import Update
 

modules/__apis__.py modules/apis.pymodules/__apis__.py renamed to modules/apis.py

@@ -8,6 +8,7 @@ async def wrapper(update: Update, context: ContextTypes.DEFAULT_TYPE):
             return result
 
         wrapper.command = cmd
+        wrapper.decorator = "command"
         return wrapper
     return decorator
 
@@ -24,5 +25,6 @@ async def wrapper(update: Update, context: ContextTypes.DEFAULT_TYPE):
             else:
                 await query.edit_message_text("‼️잘못된 요청입니다‼️")
 
+        wrapper.decorator = "callback"
         return wrapper
     return decorator

modules/__decorators__.py modules/decorators.pymodules/__decorators__.py renamed to modules/decorators.py

@@ -1,8 +1,9 @@
-from modules.__apis__ import *
-from modules.__decorators__ import command, callback
+from modules.apis import *
+from modules.decorators import command, callback
 
 from telegram import Update
 
 @command("test")
 async def test_command(update: Update):
+    print("Test command executed")
     await update.message.reply_text("This is a test command.")

modules/test.py

@@ -1,75 +1,9 @@
-import os
-import importlib.util
-import inspect
-from pathlib import Path
+from modules.apis import *
+from modules.decorators import command, callback
 
-from telegram.ext import Application
+from telegram import Update
 
-def load_modules(app: Application):
-    for py_file in Path("modules").glob("*.py"):
-        module_name = py_file.stem
-        if module_name.startswith('__'):
-            continue
-            
-        spec = importlib.util.spec_from_file_location(module_name, py_file)
-        module = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(module)
-        
-        functions = [name for name, obj in inspect.getmembers(module) 
-                    if inspect.isfunction(obj) and not name.startswith('_')]
-        
-        print(f"Module: {module_name}")
-        
-        decorator_groups = {}
-        
-        for func_name in functions:
-            func = getattr(module, func_name)
-            
-            # 데코레이터 이름 찾기
-            if hasattr(func, '__wrapped__'):
-                # 데코레이터가 적용된 함수
-                decorator_name = func.__name__ if hasattr(func, '__name__') else 'unknown'
-                # 실제 데코레이터 이름을 찾기 위해 원본 함수까지 추적
-                original_func = func
-                while hasattr(original_func, '__wrapped__'):
-                    original_func = original_func.__wrapped__
-                decorator_name = f"decorated_{original_func.__name__}"
-            else:
-                decorator_name = "no_decorator"
-            
-            if decorator_name not in decorator_groups:
-                decorator_groups[decorator_name] = []
-            decorator_groups[decorator_name].append(func_name)
-        
-        # 데코레이터별로 함수 실행
-        for decorator_name, func_names in decorator_groups.items():
-            print(f"\n[{decorator_name}]")
-            print(f"Functions: {func_names}")
-            
-            for func_name in func_names:
-                func = getattr(module, func_name)
-                sig = inspect.signature(func)
-                
-                if len(sig.parameters) == 0:
-                    if inspect.iscoroutinefunction(func):
-                        import asyncio
-                        result = asyncio.run(func())
-                        print(f"{func_name}() -> {result}")
-                    else:
-                        result = func()
-                        print(f"{func_name}() -> {result}")
-                else:
-                    try:
-                        if inspect.iscoroutinefunction(func):
-                            import asyncio
-                            result = asyncio.run(func())
-                            print(f"{func_name}() -> {result}")
-                        else:
-                            result = func()
-                            print(f"{func_name}() -> {result}")
-                    except:
-                        print(f"{func_name}() -> needs parameters")
-        
-        print("="*50)
-
-load_and_execute_modules()
+@command("test")
+async def test_command(update: Update):
+    print("Test command executed")
+    await update.message.reply_text("This is a test command.")