funAdapter bug(None or default)

src/SimilarNeuron/FuncAdapter/__init__.py

@@ -4,5 +4,6 @@
     AsyncAdapterEvent,
     FramePenetration,
     AsyncFramePenetration,
-    Result
+    Result,
+    EventName
 )

src/SimilarNeuron/FuncAdapter/funcAdapter.py

@@ -4,10 +4,12 @@
 import inspect
 import asyncio
 
-def abcmodel(self):
+class Result(list):
+    '''Adapter evnet result'''
     ...
 
-class Result(list):
+class EventName(str):
+    '''Adapter class name'''
     ...
 
 # 适配器抽象基类
@@ -71,6 +73,7 @@ def __eventspace__(self) -> Dict[str, Any]:
         space,self._dependent = {}, {}
         frame = inspect.currentframe()
         space.update(frame.f_back.f_back.f_locals)
+        self._dependent.update({EventName: self.__class__.__name__})
         self._dependent.update(
             {type(j): j for _, j in space.items()}
         )
@@ -101,12 +104,20 @@ def callback(self, result : Result) -> Any:
     def _injection(self, func: Callable) -> Dict[type, Any]:
         '''依赖注入'''
         f = inspect.signature(func)
-        return {j.name:self._dependent.get(j.annotation) for _,j in f.parameters.items()}
+        return {j.name: self._dependent.get(j.annotation) or j.default  for _,j in f.parameters.items()}
 
     def _callmethod(self, func: Callable) -> Any:
         '''注释类型方法调用'''
         return func(**self._injection(func))
 
+    def eventspace(self) -> Dict[str, Any]:
+        '''事件空间'''
+        return self._dependent
+
+    def callfunc(self, func: Callable) -> Any:
+        '''调用函数(无感知依赖注入)'''
+        return self._callmethod(func)
+
     class Config:
         arbitrary_types_allowed = True
 
@@ -137,6 +148,7 @@ async def __eventspace__(self) -> Dict[str, Any]:
         space,self._dependent = {}, {}
         frame = inspect.currentframe()
         space.update(frame.f_back.f_back.f_locals)
+        self._dependent.update({EventName: self.__class__.__name__})
         self._dependent.update(
             {type(j):j for _,j in space.items()}
             )
@@ -165,11 +177,19 @@ async def callback(self, result: Result) -> Any:
 
     async def _injection(self, func: Callable) -> Dict[type, Any]:
         f = inspect.signature(func)
-        return {j.name:self._dependent.get(j.annotation) for _,j in f.parameters.items()}
+        return {j.name:self._dependent.get(j.annotation) or j.default for _,j in f.parameters.items()}
 
     async def _callmethod(self, func: Callable) -> Any:
         return await func(**await self._injection(func))
 
+    async def eventspace(self) -> Dict[str, Any]:
+        '''事件空间'''
+        return self._dependent
+
+    async def callfunc(self, func: Callable) -> Any:
+        '''调用函数(无感知依赖注入)'''
+        return self._callmethod(func)
+
     class Config:
         arbitrary_types_allowed = True
 

src/SimilarNeuron/__init__.py

@@ -4,7 +4,8 @@
     AsyncAdapterEvent,
     FramePenetration,
     AsyncFramePenetration,
-    Result
+    Result,
+    EventName
 )
 from .Granular import (
     structure,

src/SimilarNeuron/typing.py

@@ -4,7 +4,8 @@
     AsyncAdapterEvent,
     FramePenetration,
     AsyncFramePenetration,
-    Result
+    Result,
+    EventName
 )
 from .Granular import (
     container,

src/SimilarNeuron/utils/container.py

@@ -1,8 +1,6 @@
 from datetime import datetime, timedelta
 import time
 
-from pydantic.fields import T
-
 class TimeBoundCache():
     '''时限缓存容器'''
 

src/test/test3-AdapterEvent.py

@@ -42,9 +42,7 @@ def on_pause():
     def coupler(self, message: MessageChain) -> dict:
         '''协议转换'''
 
-        return {
-            'text': Text(message.message.keys())
-        }
+        return (Text(message.message.keys()), )
 
     def match(self) -> bool:
         '''匹配事件'''