pymud 0.20.4__py3-none-any.whl → 0.21.0__py3-none-any.whl

pymud/objects.py

@@ -4,10 +4,12 @@ MUD会话(session)中, 支持的对象列表
 
 import asyncio, logging, re, importlib
 from abc import ABC, ABCMeta, abstractmethod
+from typing import Optional, Union, List, Dict, Tuple
 from collections.abc import Iterable
 from collections import namedtuple
 from typing import Any
 from .settings import Settings
+from .decorators import exception, async_exception, print_exception
 
 class CodeLine:
     """
@@ -37,7 +39,7 @@ class CodeLine:
                 elif ch == "}":
                     brace_count -= 1
                     if brace_count < 0:
-                        raise Exception("错误的代码块，大括号数量不匹配")
+                        raise Exception(Settings.gettext("excpetion_brace_not_matched"))
                     arg += ch
                 elif ch == "'":
                     if single_quote == 0:
@@ -60,7 +62,7 @@ class CodeLine:
                     arg += ch
 
             if (single_quote > 0) or (double_quote > 0):
-                raise Exception("引号的数量不匹配")
+                raise Exception(Settings.gettext("exception_quote_not_matched"))
             
             if arg:
                 code_params.append(arg)
@@ -77,7 +79,7 @@ class CodeLine:
         
             return syncmode, hasvar, tuple(code_params), 
         else:
-            return syncmode, hasvar, tuple()
+            return "dontcare", hasvar, tuple()
 
     def __init__(self, _code: str) -> None:
         self.__code = _code
@@ -108,7 +110,7 @@ class CodeLine:
 
         line = kwargs.get("line", None) or session.getVariable("%line", "None")
         raw  = kwargs.get("raw", None) or session.getVariable("%raw", "None")
-        wildcards = kwargs.get("wildcards", None)
+        wildcards = kwargs.get("wildcards", ())
 
         for item in self.code:
             if len(item) == 0: continue
@@ -178,7 +180,7 @@ class CodeBlock:
             elif ch == "}":
                 brace_count -= 1
                 if brace_count < 0:
-                    raise Exception("错误的代码块，大括号数量不匹配")
+                    raise Exception(Settings.gettext("excpetion_brace_not_matched"))
                 line += ch
             elif ch == ";":
                 if brace_count == 0:
@@ -264,7 +266,7 @@ class CodeBlock:
             elif self.syncmode == "sync":
                 sync = True
             elif self.syncmode == "conflict":
-                session.warning("该命令中同时存在强制同步命令和强制异步命令，将使用异步执行，同步命令将失效。")
+                session.warning(Settings.gettext("exception_forced_async"))
                 sync = False
 
         if sync:
@@ -326,11 +328,11 @@ class BaseObject:
         if isinstance(session, Session):
             self.session    = session
         else:
-            assert("session must be an instance of class Session!")
+            assert(Settings.gettext("exception_session_type_fail"))
             
         self._enabled   = True              # give a default value
         self.log        = logging.getLogger(f"pymud.{self.__class__.__name__}")
-        self.id         = kwargs.get("id", session.getUniqueID(self.__class__.__abbr__))
+        self.id         = kwargs.get("id", self.session.getUniqueID(self.__class__.__abbr__))
         self.group      = kwargs.get("group", "")                  # 组
         self.enabled    = kwargs.get("enabled", True)              # 使能与否
         self.priority   = kwargs.get("priority", 100)              # 优先级
@@ -417,6 +419,8 @@ class GMCPTrigger(BaseObject):
     def __init__(self, session, name, *args, **kwargs):
         self.event = asyncio.Event()
         self.value = None
+        # 确保不要有重复的id
+        kwargs.pop("id", None)
         super().__init__(session, id = name, *args, **kwargs)
 
     def __del__(self):
@@ -445,10 +449,13 @@ class GMCPTrigger(BaseObject):
 
         self.line  = value
         self.value = value_exp
-
+        
         if callable(self._onSuccess):
             self.event.set()
-            self._onSuccess(self.id, value, value_exp)
+            try:
+                self._onSuccess(self.id, value, value_exp)
+            except Exception as e:
+                print_exception(self.session, e)
 
     def __detailed__(self) -> str:
         group = f'group = "{self.group}" ' if self.group else ''
@@ -502,7 +509,7 @@ class MatchObject(BaseObject):
         return self._patterns
 
     @patterns.setter
-    def patterns(self, patterns):
+    def patterns(self, patterns: Union[str, Union[Tuple[str], List[str]]]):
         self._patterns = patterns
 
         if isinstance(patterns, str):
@@ -515,14 +522,17 @@ class MatchObject(BaseObject):
         if self.isRegExp:
             flag = 0
             if self.ignoreCase: flag = re.I
-            if not self.multiline:
-                self._regExp = re.compile(self.patterns, flag)   # 此处可考虑增加flags
+            if isinstance(patterns, str):
+                self.multiline = False
+                self.linesToMatch = 1
+                self._regExp = re.compile(patterns, flag)   # 此处可考虑增加flags
             else:
                 self._regExps = []
-                for line in self.patterns:
+                for line in patterns:
                     self._regExps.append(re.compile(line, flag))
 
                 self.linesToMatch = len(self._regExps)
+                self.multiline = True
                 self._mline = 0
 
     def reset(self):
@@ -542,76 +552,79 @@ class MatchObject(BaseObject):
 
         :return: BaseObject.State 类型，一个包含 result, id, name, line, wildcards 的命名元组对象
         """
-        result = self.NOTSET
-
-        if not self.multiline:                              # 非多行
-            if self.isRegExp:
-                m = self._regExp.match(line)
-                if m:
-                    result = self.SUCCESS
-                    self.wildcards.clear()
-                    if len(m.groups()) > 0:
-                        self.wildcards.extend(m.groups())
+        try:
+            result = self.NOTSET
 
-                    self.lines.clear()
-                    self.lines.append(line)
-            else:
-                #if line.find(self.patterns) >= 0:
-                #if line == self.patterns:
-                if self.patterns in line:
-                    result = self.SUCCESS
-                    self.lines.clear()
-                    self.lines.append(line)
-                    self.wildcards.clear()
-
-        else:                                               # 多行匹配情况
-            # multilines match. 多行匹配时，受限于行的捕获方式，必须一行一行来，设置状态标志进行处理。
-            if self._mline == 0:                            # 当尚未开始匹配时，匹配第1行
-                m = self._regExps[0].match(line)
-                if m:
-                    self.lines.clear()
-                    self.lines.append(line)
-                    self.wildcards.clear()
-                    if len(m.groups()) > 0:
-                        self.wildcards.extend(m.groups())
-                    self._mline = 1                         # 下一状态 （中间行）
-            elif (self._mline > 0) and (self._mline < self.linesToMatch - 1):
-                m = self._regExps[self._mline].match(line)
-                if m:
-                    self.lines.append(line)
-                    if len(m.groups()) > 0:
-                        self.wildcards.extend(m.groups())
-                    self._mline += 1
+            if not self.multiline:                              # 非多行
+                if self.isRegExp:
+                    m = self._regExp.match(line)
+                    if m:
+                        result = self.SUCCESS
+                        self.wildcards.clear()
+                        if len(m.groups()) > 0:
+                            self.wildcards.extend(m.groups())
+
+                        self.lines.clear()
+                        self.lines.append(line)
                 else:
-                    self._mline = 0
-            elif self._mline == self.linesToMatch - 1:      # 最终行
-                m = self._regExps[self._mline].match(line)
-                if m:
-                    self.lines.append(line)
-                    if len(m.groups()) > 0:
-                        self.wildcards.extend(m.groups())
-                    result = self.SUCCESS
-
-                self._mline = 0
+                    #if line.find(self.patterns) >= 0:
+                    #if line == self.patterns:
+                    if isinstance(self.patterns, str) and (self.patterns in line):
+                        result = self.SUCCESS
+                        self.lines.clear()
+                        self.lines.append(line)
+                        self.wildcards.clear()
+
+            else:                                               # 多行匹配情况
+                # multilines match. 多行匹配时，受限于行的捕获方式，必须一行一行来，设置状态标志进行处理。
+                if self._mline == 0:                            # 当尚未开始匹配时，匹配第1行
+                    m = self._regExps[0].match(line)
+                    if m:
+                        self.lines.clear()
+                        self.lines.append(line)
+                        self.wildcards.clear()
+                        if len(m.groups()) > 0:
+                            self.wildcards.extend(m.groups())
+                        self._mline = 1                         # 下一状态 （中间行）
+                elif (self._mline > 0) and (self._mline < self.linesToMatch - 1):
+                    m = self._regExps[self._mline].match(line)
+                    if m:
+                        self.lines.append(line)
+                        if len(m.groups()) > 0:
+                            self.wildcards.extend(m.groups())
+                        self._mline += 1
+                    else:
+                        self._mline = 0
+                elif self._mline == self.linesToMatch - 1:      # 最终行
+                    m = self._regExps[self._mline].match(line)
+                    if m:
+                        self.lines.append(line)
+                        if len(m.groups()) > 0:
+                            self.wildcards.extend(m.groups())
+                        result = self.SUCCESS
 
-        state = BaseObject.State(result, self.id, "\n".join(self.lines), tuple(self.wildcards))
+                    self._mline = 0
 
-        # 采用回调方式执行的时候，执行函数回调（仅当self.sync和docallback均为真时才执行同步
-        # 当docallback为真时，是真正的进行匹配和触发，为false时，仅返回匹配结果，不实际触发
-        if docallback:
-            if self.sync:
-                if state.result == self.SUCCESS:
-                    self._onSuccess(state.id, state.line, state.wildcards)
-                elif state.result == self.FAILURE:
-                    self._onFailure(state.id, state.line, state.wildcards)
-                elif state.result == self.TIMEOUT:
-                    self._onTimeout(state.id, state.line, state.wildcards)
-            
-            if state.result == self.SUCCESS:
-                self.event.set()
+            state = BaseObject.State(result, self.id, "\n".join(self.lines), tuple(self.wildcards))
+
+            # 采用回调方式执行的时候，执行函数回调（仅当self.sync和docallback均为真时才执行同步
+            # 当docallback为真时，是真正的进行匹配和触发，为false时，仅返回匹配结果，不实际触发
+            if docallback:
+                if self.sync:
+                    if state.result == self.SUCCESS:
+                        self._onSuccess(state.id, state.line, state.wildcards)
+                    elif state.result == self.FAILURE:
+                        self._onFailure(state.id, state.line, state.wildcards)
+                    elif state.result == self.TIMEOUT:
+                        self._onTimeout(state.id, state.line, state.wildcards)
                 
-        self.state = state
-        return state
+                if state.result == self.SUCCESS:
+                    self.event.set()
+                    
+            self.state = state
+            return state
+        except Exception as e:
+            print_exception(self.session, e)
     
     async def matched(self) -> BaseObject.State:
         """
@@ -624,10 +637,10 @@ class MatchObject(BaseObject):
             self.reset()
             await self.event.wait()
             self.reset()
-        except Exception as e:
-            self.error(f"异步执行中遇到异常, {e}")
 
-        return self.state
+            return self.state
+        except Exception as e:
+            print_exception(self.session, e)
     
     def __detailed__(self) -> str:
         group = f'group = "{self.group}" ' if self.group else ''
@@ -676,7 +689,7 @@ class Trigger(MatchObject):
 
     __abbr__ = "tri"
 
-    def __init__(self, session, patterns, *args, **kwargs):
+    def __init__(self, session, patterns: Union[str, Union[Tuple[str], List[str]]], *args, **kwargs):
         super().__init__(session, patterns, *args, **kwargs)
         self._task = None
 
@@ -787,7 +800,7 @@ class Command(MatchObject):
             if isinstance(task, asyncio.Task) and (not task.done()):
                 self.remove_task(task)
 
-    async def execute(self, cmd, *args, **kwargs):
+    async def execute(self, cmd, *args, **kwargs) -> Any:
         """
         命令调用的入口函数。该函数由 Session 进行自动调用。
         通过 ``Session.exec`` 系列方法调用的命令，最终是执行该命令的 execute 方法。
@@ -815,7 +828,7 @@ class SimpleCommand(Command):
 
     MAX_RETRY = 20
 
-    def __init__(self, session, patterns, succ_tri, *args, **kwargs):
+    def __init__(self, session, patterns: str, succ_tri, *args, **kwargs):
         super().__init__(session, patterns, succ_tri, *args, **kwargs)
         self._succ_tris = list()
         self._fail_tris = list()
@@ -857,7 +870,7 @@ class SimpleCommand(Command):
         """
         self.reset()
         # 0. check command
-        cmd = cmd or self.patterns
+        cmd = cmd or self.patterns.__str__()
         # 1. save the command, to use later.
         self._executed_cmd = cmd
         # 2. writer command
@@ -912,23 +925,14 @@ class SimpleCommand(Command):
                 break
 
         if result == self.SUCCESS:
-            self._onSuccess(name = self.id, cmd = cmd, line = line, wildcards = wildcards)
-            _outer_onSuccess = kwargs.get("onSuccess", None)
-            if callable(_outer_onSuccess):
-                _outer_onSuccess(name = self.id, cmd = cmd, line = line, wildcards = wildcards)
+            self._onSuccess(name = self.id, cmd = cmd, line = "", wildcards = [])
 
         elif result == self.FAILURE:
-            self._onFailure(name = self.id, cmd = cmd, line = line, wildcards = wildcards)
-            _outer_onFailure = kwargs.get("onFailure", None)
-            if callable(_outer_onFailure):
-                _outer_onFailure(name = self.id, cmd = cmd, line = line, wildcards = wildcards)
+            self._onFailure(name = self.id, cmd = cmd, line = "", wildcards = [])
 
         elif result == self.TIMEOUT:
             self._onTimeout(name = self.id, cmd = cmd, timeout = self.timeout)
-            _outer_onTimeout = kwargs.get("onTimeout", None)
-            if callable(_outer_onTimeout):
-                _outer_onTimeout(name = self.id, cmd = cmd, timeout = self.timeout)
-
+ 
         return result
 
 class Timer(BaseObject):