.

cloud_event.py

@@ -1,23 +0,0 @@
-import json
-from dataclasses import dataclass, asdict
-from datetime import datetime, timezone
-from typing import Any
-
-@dataclass
-class CloudEvent:
-    id: str
-    type: str
-    source: str
-    time: str
-    data: Any
-
-    @staticmethod
-    def wrap(obj: Any, *, event_type: str, source: str, id: str) -> bytes:
-        evt = CloudEvent(
-            id=id,
-            type=event_type or (obj.__class__.__name__ if obj is not None else "NullOrEmpty"),
-            source=source,
-            time=datetime.now(timezone.utc).isoformat(),
-            data=obj,
-        )
-        return json.dumps(asdict(evt), ensure_ascii=False).encode("utf-8")

models.py

@@ -8,6 +8,8 @@ from zoneinfo import ZoneInfo
 import secrets
 import string
 
+
+
 # ---------------- Nanoid-ish helper ----------------
 _ALPHABET = string.ascii_letters + string.digits
 def _nanoid(size: int = 21) -> str:
@@ -200,11 +202,10 @@ class UserInfo(BaseModel):
             setattr(self, k, v)
 
 
-# ---------- LLMServiceObj (full C# parity) ----------
 class LLMServiceObj(BaseModel):
     """
     Python port of NetworkMonitor.Objects.ServiceMessage.LLMServiceObj
-    retaining field names and behavior (stacks, function state methods, time helpers).
+    – same JSON/wire names via aliases, no Pydantic forward-ref clash.
     """
     model_config = ConfigDict(populate_by_name=True)
 
@@ -236,10 +237,10 @@ class LLMServiceObj(BaseModel):
     IsSystemLlm: bool = False
     Timeout: Optional[int] = None
 
-    # --- complex ---
+    # --- complex (use aliases to preserve JSON names) ---
     FunctionCallId: str = ""
-    FunctionCallData: FunctionCallData = Field(default_factory=FunctionCallData)
-    UserInfo: UserInfo = Field(default_factory=UserInfo)
+    function_call_data: FunctionCallData = Field(default_factory=FunctionCallData, alias="FunctionCallData")
+    user_info: UserInfo = Field(default_factory=UserInfo, alias="UserInfo")
 
     # --- stacks ---
     LlmStack: List[str] = Field(default_factory=list)
@@ -280,7 +281,7 @@ class LLMServiceObj(BaseModel):
         self.IsUserLoggedIn = other.IsUserLoggedIn
         self.JsonFunction = other.JsonFunction
 
-        # function state
+        # state
         self.functionState = FunctionState().SetFunctionState(
             other.IsFunctionCall,
             other.IsFunctionCallResponse,
@@ -313,11 +314,8 @@ class LLMServiceObj(BaseModel):
         self.IsProcessed = other.IsProcessed
 
         # deep copies
-        self.FunctionCallData = FunctionCallData()
-        self.FunctionCallData.copy_from(other.FunctionCallData)
-
-        self.UserInfo = UserInfo()
-        self.UserInfo.copy_from(other.UserInfo)
+        self.function_call_data = other.function_call_data.model_copy(deep=True)
+        self.user_info = other.user_info.model_copy(deep=True)
 
         self.LlmStack = list(other.LlmStack)
         self.FunctionCallIdStack = list(other.FunctionCallIdStack)
@@ -325,7 +323,7 @@ class LLMServiceObj(BaseModel):
         self.MessageIDStack = list(other.MessageIDStack)
         self.IsProcessedStack = list(other.IsProcessedStack)
 
-    # ---------------- Function state passthroughs (C# names) ----------------
+    # ---------------- Function state passthroughs ----------------
     def GetFunctionStateString(self) -> str:
         return self.functionState.StatesString()
 
@@ -342,41 +340,31 @@ class LLMServiceObj(BaseModel):
     def SetFunctionState(self, a: bool, b: bool, c: bool, d: bool, e: bool) -> None:
         self.functionState.SetFunctionState(a, b, c, d, e)
 
-    # C# exposes the flags as properties that forward to functionState; we mirror that with @property
+    # forwarders to preserve .IsFunction* flags on the parent
     @property
-    def IsFunctionCall(self) -> bool:
-        return self.functionState.IsFunctionCall
+    def IsFunctionCall(self) -> bool: return self.functionState.IsFunctionCall
     @IsFunctionCall.setter
-    def IsFunctionCall(self, v: bool) -> None:
-        self.functionState.IsFunctionCall = v
+    def IsFunctionCall(self, v: bool) -> None: self.functionState.IsFunctionCall = v
 
     @property
-    def IsFunctionCallResponse(self) -> bool:
-        return self.functionState.IsFunctionCallResponse
+    def IsFunctionCallResponse(self) -> bool: return self.functionState.IsFunctionCallResponse
     @IsFunctionCallResponse.setter
-    def IsFunctionCallResponse(self, v: bool) -> None:
-        self.functionState.IsFunctionCallResponse = v
+    def IsFunctionCallResponse(self, v: bool) -> None: self.functionState.IsFunctionCallResponse = v
 
     @property
-    def IsFunctionCallError(self) -> bool:
-        return self.functionState.IsFunctionCallError
+    def IsFunctionCallError(self) -> bool: return self.functionState.IsFunctionCallError
     @IsFunctionCallError.setter
-    def IsFunctionCallError(self, v: bool) -> None:
-        self.functionState.IsFunctionCallError = v
+    def IsFunctionCallError(self, v: bool) -> None: self.functionState.IsFunctionCallError = v
 
     @property
-    def IsFunctionCallStatus(self) -> bool:
-        return self.functionState.IsFunctionCallStatus
+    def IsFunctionCallStatus(self) -> bool: return self.functionState.IsFunctionCallStatus
     @IsFunctionCallStatus.setter
-    def IsFunctionCallStatus(self, v: bool) -> None:
-        self.functionState.IsFunctionCallStatus = v
+    def IsFunctionCallStatus(self, v: bool) -> None: self.functionState.IsFunctionCallStatus = v
 
     @property
-    def IsFunctionStillRunning(self) -> bool:
-        return self.functionState.IsFunctionStillRunning
+    def IsFunctionStillRunning(self) -> bool: return self.functionState.IsFunctionStillRunning
     @IsFunctionStillRunning.setter
-    def IsFunctionStillRunning(self, v: bool) -> None:
-        self.functionState.IsFunctionStillRunning = v
+    def IsFunctionStillRunning(self, v: bool) -> None: self.functionState.IsFunctionStillRunning = v
 
     # ---------------- Stack helpers & routing props ----------------
     def PopLlm(self) -> None:
@@ -400,27 +388,19 @@ class LLMServiceObj(BaseModel):
 
     @property
     def LlmChainStartName(self) -> str:
-        if not self.LlmStack:
-            return self.SourceLlm
-        return self.LlmStack[0]
+        return self.SourceLlm if not self.LlmStack else self.LlmStack[0]
 
     @property
     def RootMessageID(self) -> str:
-        if not self.MessageIDStack:
-            return self.MessageID
-        return self.MessageIDStack[0]
+        return self.MessageID if not self.MessageIDStack else self.MessageIDStack[0]
 
     @property
     def FirstFunctionName(self) -> str:
-        if not self.FunctionNameStack:
-            return self.FunctionName
-        return self.FunctionNameStack[0]
+        return self.FunctionName if not self.FunctionNameStack else self.FunctionNameStack[0]
 
     @property
     def IsPrimaryLlm(self) -> bool:
-        if self.IsSystemLlm:
-            return False
-        return self.SourceLlm == self.DestinationLlm
+        return False if self.IsSystemLlm else (self.SourceLlm == self.DestinationLlm)
 
     def PopMessageID(self) -> None:
         if self.MessageIDStack:
@@ -466,8 +446,7 @@ class LLMServiceObj(BaseModel):
 
     def GetClientCurrentTime(self) -> datetime:
         try:
-            utc_now = datetime.now(timezone.utc)
-            return utc_now.astimezone(self._tz())
+            return datetime.now(timezone.utc).astimezone(self._tz())
         except Exception:
             return datetime.now(timezone.utc)
 
@@ -489,6 +468,22 @@ class LLMServiceObj(BaseModel):
         except Exception:
             return int(datetime.now(timezone.utc).timestamp())
 
+    # ---------- Optional: keep .FunctionCallData / .UserInfo attribute names ----------
+    # (handy if other code already references those names in Python)
+    @property
+    def FunctionCallData(self) -> FunctionCallData:
+        return self.function_call_data
+    @FunctionCallData.setter
+    def FunctionCallData(self, v: FunctionCallData) -> None:
+        self.function_call_data = v
+
+    @property
+    def UserInfo(self) -> UserInfo:
+        return self.user_info
+    @UserInfo.setter
+    def UserInfo(self, v: UserInfo) -> None:
+        self.user_info = v
+
 
 # ---------- ResultObj ----------
 class ResultObj(BaseModel):