pygpt-net 2.4.37__py3-none-any.whl → 2.4.41__py3-none-any.whl

pygpt_net/core/bridge/__init__.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 20:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import time
 from datetime import datetime, timedelta
+from typing import Optional, Dict, Any
 
 from pygpt_net.core.types import (
     MODE_AGENT,
@@ -36,10 +37,17 @@ class Bridge:
         self.last_call = None  # last API call time, for throttling
         self.last_context = None  # last context
         self.last_context_quick = None  # last context for quick call
-        self.sync_modes = [MODE_ASSISTANT, MODE_EXPERT]
+        self.sync_modes = [
+            MODE_ASSISTANT,
+            MODE_EXPERT,
+        ]
         self.worker = None
 
-    def request(self, context: BridgeContext, extra: dict = None) -> bool:
+    def request(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> bool:
         """
         Make request to provider
 
@@ -135,7 +143,11 @@ class Bridge:
         self.window.threadpool.start(self.worker)
         return True
 
-    def request_next(self, context: BridgeContext, extra: dict = None) -> bool:
+    def request_next(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> bool:
         """
         Make next call to provider (loop next step)
 
@@ -158,7 +170,11 @@ class Bridge:
         self.window.threadpool.start(self.worker)
         return True
 
-    def call(self, context: BridgeContext, extra: dict = None) -> str:
+    def call(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> str:
         """
         Make quick call to provider and get response content
 
@@ -221,7 +237,7 @@ class Bridge:
             extra=extra,
         )
 
-    def get_worker(self):
+    def get_worker(self) -> BridgeWorker:
         """
         Prepare async worker
 

pygpt_net/core/bridge/context.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 19:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Dict, Any
+
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.item.model import ModelItem
 
@@ -47,7 +49,7 @@ class BridgeContext:
         if self.model is not None and not isinstance(self.model, ModelItem):
             raise ValueError("Invalid model instance")
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> Dict[str, Any]:
         """
         Return as dictionary
 
@@ -95,7 +97,7 @@ class MultimodalContext:
         self.audio_data = kwargs.get("audio_data", None)
         self.audio_format = kwargs.get("audio_format", "wav")
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> Dict[str, Any]:
         """
         Return as dictionary
 

pygpt_net/core/calendar/__init__.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.12 06:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import datetime
+from typing import Optional, Dict
 
 from packaging.version import Version
 
@@ -33,10 +34,19 @@ class Calendar:
         self.provider.install()
 
     def patch(self, app_version: Version):
-        """Patch provider data"""
+        """
+        Patch provider data
+
+        :param app_version: app version
+        """
         self.provider.patch(app_version)
 
-    def get_by_date(self, year: int, month: int, day: int) -> CalendarNoteItem or None:
+    def get_by_date(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ) -> Optional[CalendarNoteItem]:
         """
         Get note by date
 
@@ -51,7 +61,7 @@ class Calendar:
             return self.items[dt_key]
         return None
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[str, CalendarNoteItem]:
         """
         Get all notes
 
@@ -97,7 +107,12 @@ class Calendar:
         self.save(note.year, note.month, note.day)
         return True
 
-    def load(self, year: int, month: int, day: int):
+    def load(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ):
         """
         Load note by idx
 
@@ -109,7 +124,12 @@ class Calendar:
         dt_key = datetime.datetime(year, month, day).strftime("%Y-%m-%d")
         self.items[dt_key] = self.provider.load(year, month, day)
 
-    def load_note(self, year: int, month: int, day: int) -> str:
+    def load_note(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ) -> str:
         """
         Load note by idx
 
@@ -123,7 +143,13 @@ class Calendar:
             return str(note.content)
         return ""
 
-    def append_to_note(self, year: int, month: int, day: int, text: str) -> bool:
+    def append_to_note(
+            self,
+            year: int,
+            month: int,
+            day: int,
+            text: str
+    ) -> bool:
         """
         Append to note
 
@@ -148,7 +174,13 @@ class Calendar:
         self.load(year, month, day)
         return True
 
-    def update_note(self, year: int, month: int, day: int, text: str) -> bool:
+    def update_note(
+            self,
+            year: int,
+            month: int,
+            day: int,
+            text: str
+    ) -> bool:
         """
         Append to note
 
@@ -169,7 +201,12 @@ class Calendar:
         self.load(year, month, day)
         return True
 
-    def remove_note(self, year: int, month: int, day: int) -> bool:
+    def remove_note(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ) -> bool:
         """
         Remove note by date
 
@@ -198,7 +235,11 @@ class Calendar:
         """
         self.items = self.provider.load_by_month(year, month)
 
-    def get_notes_existence_by_day(self, year, month) -> dict:
+    def get_notes_existence_by_day(
+            self,
+            year: int,
+            month: int
+    ) -> Dict[str, Dict[int, int]]:
         """
         Get notes existence by day
 
@@ -208,7 +249,12 @@ class Calendar:
         """
         return self.provider.get_notes_existence_by_day(year, month)
 
-    def save(self, year: int, month: int, day: int) -> bool:
+    def save(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ) -> bool:
         """
         Save note by date
 

pygpt_net/core/chain/__init__.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 20:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, Dict, Any
+
 from pygpt_net.core.types import (
     MODE_CHAT,
     MODE_COMPLETION,
@@ -32,7 +34,11 @@ class Chain:
         self.chat = Chat(window)
         self.completion = Completion(window)
 
-    def call(self, context: BridgeContext, extra: dict = None) -> bool:
+    def call(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> bool:
         """
         Call LLM using Langchain
 

pygpt_net/core/chain/chat.py

@@ -6,15 +6,17 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
-from langchain_core.messages import SystemMessage, HumanMessage, AIMessage
+from typing import Optional, List
 
+from langchain_core.messages import SystemMessage, HumanMessage, AIMessage
 
 from pygpt_net.core.types import (
     MODE_CHAT,
 )
+from pygpt_net.item.ctx import CtxItem
 from pygpt_net.item.model import ModelItem
 
 
@@ -33,10 +35,10 @@ class Chat:
             prompt: str,
             system_prompt: str,
             model: ModelItem,
-            history: list = None,
+            history: Optional[List[CtxItem]] = None,
             stream: bool = False,
-            ai_name: str = None,
-            user_name: str = None
+            ai_name: Optional[str] = None,
+            user_name: Optional[str] = None
     ):
         """
         Chat with LLM
@@ -93,9 +95,9 @@ class Chat:
             prompt: str,
             system_prompt: str,
             model: ModelItem,
-            history: list = None,
-            ai_name: str = None,
-            user_name: str = None
+            history: Optional[List[CtxItem]] = None,
+            ai_name: Optional[str] = None,
+            user_name: Optional[str] = None
     ) -> list:
         """
         Build chat messages list

pygpt_net/core/chain/completion.py

@@ -6,12 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, List
+
 from pygpt_net.core.types import (
     MODE_COMPLETION,
 )
+from pygpt_net.item.ctx import CtxItem
 from pygpt_net.item.model import ModelItem
 
 
@@ -30,10 +33,10 @@ class Completion:
             prompt: str,
             system_prompt: str,
             model: ModelItem,
-            history: list = None,
+            history: Optional[List[CtxItem]] = None,
             stream: bool = False,
-            ai_name: str = None,
-            user_name: str = None
+            ai_name: Optional[str] = None,
+            user_name: Optional[str] = None
     ):
         """
         Chat with LLM
@@ -88,9 +91,9 @@ class Completion:
             prompt: str,
             system_prompt: str,
             model: ModelItem,
-            history: list = None,
-            ai_name: str = None,
-            user_name: str = None
+            history: Optional[List[CtxItem]] = None,
+            ai_name: Optional[str] = None,
+            user_name: Optional[str] = None
     ) -> str:
         """
         Build completion string

pygpt_net/core/command.py

@@ -6,18 +6,20 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 20:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import copy
 import json
 import re
+from typing import Optional, Dict, Any, List
 
 from pygpt_net.core.types import (
     MODE_ASSISTANT,
     MODE_COMPLETION,
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
+    MODE_AUDIO,
 )
 from pygpt_net.core.events import Event
 from pygpt_net.item.ctx import CtxItem
@@ -34,7 +36,10 @@ class Command:
         """
         self.window = window
 
-    def append_syntax(self, data: dict) -> str:
+    def append_syntax(
+            self,
+            data: Dict[str, Any]
+    ) -> str:
         """
         Append command syntax to the system prompt
 
@@ -55,7 +60,10 @@ class Command:
         prompt += cmd_prompt.strip().replace("{extra}", extra).replace("{schema}", schema)
         return prompt
 
-    def extract_syntax(self, cmds: list) -> str:
+    def extract_syntax(
+            self,
+            cmds: List[Dict[str, Any]]
+    ) -> str:
         """
         Extract syntax from commands
 
@@ -117,7 +125,7 @@ class Command:
         regex_cmd = r'~###~\s*{.*}\s*~###~'
         return bool(re.search(regex_cmd, text))
 
-    def extract_cmds(self, text: str) -> list:
+    def extract_cmds(self, text: str) -> List[Dict[str, Any]]:
         """
         Extract commands from text
 
@@ -136,7 +144,7 @@ class Command:
             pass
         return cmds
 
-    def extract_cmd(self, chunk: str) -> dict or None:
+    def extract_cmd(self, chunk: str) -> Optional[Dict[str, Any]]:
         """
         Extract command from text chunk (JSON string)
 
@@ -170,7 +178,10 @@ class Command:
                 pass
         return cmd
 
-    def from_commands(self, cmds: list) -> list:
+    def from_commands(
+            self,
+            cmds: List[Dict[str, Any]]
+    ) -> List[Dict[str, Any]]:
         """
         Unpack commands to execution list
 
@@ -183,7 +194,10 @@ class Command:
                 commands.append(cmd)
         return commands
 
-    def unpack_tool_calls(self, tool_calls: list) -> list:
+    def unpack_tool_calls(
+            self,
+            tool_calls: List
+    ) -> List[Dict[str, Any]]:
         """
         Unpack tool calls from OpenAI response
 
@@ -208,7 +222,11 @@ class Command:
                 print("Error parsing tool call: " + str(e))
         return parsed
 
-    def unpack_tool_calls_chunks(self, ctx: CtxItem, tool_calls: list):
+    def unpack_tool_calls_chunks(
+            self,
+            ctx: CtxItem,
+            tool_calls: List[Dict[str, Any]]
+    ):
         """
         Handle / unpack tool calls
 
@@ -231,7 +249,10 @@ class Command:
                 print("Error parsing tool call JSON arguments: ", tool_call["function"]["arguments"])
         ctx.tool_calls = tmp_calls
 
-    def unpack_tool_calls_from_llama(self, tool_calls: list) -> list:
+    def unpack_tool_calls_from_llama(
+            self,
+            tool_calls: List
+    ) -> List[Dict[str, Any]]:
         """
         Unpack tool calls from Llama-index response
 
@@ -256,7 +277,10 @@ class Command:
                 print("Error parsing tool call: " + str(e))
         return parsed
 
-    def tool_call_to_cmd(self, tool_call: dict) -> dict:
+    def tool_call_to_cmd(
+            self,
+            tool_call: Dict[str, Any]
+    ) -> Dict[str, Any]:
         """
         Convert tool call to command
 
@@ -268,7 +292,10 @@ class Command:
             "params": tool_call["function"]["arguments"]
         }
 
-    def tool_calls_to_cmds(self, tool_calls: list) -> list:
+    def tool_calls_to_cmds(
+            self,
+            tool_calls: List[Dict[str, Any]]
+    ) -> list:
         """
         Convert tool calls to commands
 
@@ -280,7 +307,10 @@ class Command:
             cmds.append(self.tool_call_to_cmd(tool_call))
         return cmds
 
-    def pack_cmds(self, cmds: list) -> str:
+    def pack_cmds(
+            self,
+            cmds: List[Dict[str, Any]]
+    ) -> str:
         """
         Pack commands to string
 
@@ -342,7 +372,10 @@ class Command:
         ctx.extra["tool_calls_outputs"] = outputs
         return outputs
 
-    def get_functions(self, parent_id: str = None) -> list:
+    def get_functions(
+            self,
+            parent_id: Optional[str] = None
+    ) -> List[Dict[str, Any]]:
         """
         Get current functions list
 
@@ -357,7 +390,11 @@ class Command:
             func_user = []
         return func + func_user  # merge both
 
-    def as_native_functions(self, all: bool = False, parent_id: str = None) -> list:
+    def as_native_functions(
+            self,
+            all: bool = False,
+            parent_id: Optional[str] = None
+    ) -> List[Dict[str, Any]]:
         """
         Convert internal functions to native API format
         
@@ -373,7 +410,8 @@ class Command:
         functions = [
         {
             "name": "get_delivery_date",
-            "description": "Get the delivery date for a customer's order. Call this whenever you need to know the delivery date, for example when a customer asks 'Where is my package'",
+            "description": "Get the delivery date for a customer's order. Call this whenever you need to know 
+            the delivery date, for example when a customer asks 'Where is my package'",
             "params": {
                 "type": "object",
                 "properties": {
@@ -410,7 +448,10 @@ class Command:
             func_experts = self.cmds_to_functions(self.window.core.experts.get_functions())  # agent functions
         return func_plugins + func_agent + func_experts
 
-    def cmds_to_functions(self, cmds: list) -> list:
+    def cmds_to_functions(
+            self,
+            cmds: List[Dict[str, Any]]
+    ) -> List[Dict[str, Any]]:
         """
         Convert commands to functions (native API format)
 
@@ -433,7 +474,10 @@ class Command:
                 )
         return functions
 
-    def extract_params(self, cmd: dict) -> dict:
+    def extract_params(
+            self,
+            cmd: Dict[str, Any]
+    ) -> Dict[str, Any]:
         """
         Extract parameters from command (to native API JSON schema format)
 
@@ -537,6 +581,7 @@ class Command:
             MODE_LLAMA_INDEX,
             MODE_LANGCHAIN,
             MODE_COMPLETION,
+            MODE_AUDIO,
         ]
         mode = self.window.core.config.get('mode')
         if mode in disabled_modes: