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

pygpt_net/provider/gpt/vision.py

@@ -6,17 +6,19 @@
 # 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 22:00:00                  #
 # ================================================== #
 
 import base64
 import os
 import re
+from typing import Optional, Union, Dict, Any, List
 
 from pygpt_net.core.types import (
     MODE_VISION,
 )
 from pygpt_net.core.bridge.context import BridgeContext
+from pygpt_net.item.attachment import AttachmentItem
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.item.model import ModelItem
 
@@ -33,7 +35,11 @@ class Vision:
         self.urls = []
         self.input_tokens = 0
 
-    def send(self, context: BridgeContext, extra: dict = None):
+    def send(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ):
         """
         Call OpenAI API for chat with vision
 
@@ -77,9 +83,9 @@ class Vision:
             prompt: str,
             system_prompt: str,
             model: ModelItem,
-            history: list = None,
-            attachments: dict = None,
-    ) -> list:
+            history: Optional[List[CtxItem]] = None,
+            attachments: Optional[Dict[str, AttachmentItem]] = None,
+    ) -> List[dict]:
         """
         Build chat messages list
 
@@ -160,9 +166,9 @@ class Vision:
 
     def build_content(
             self,
-            content: str or list,
-            attachments: dict = None,
-    ) -> list:
+            content: Union[str, list],
+            attachments: Optional[Dict[str, AttachmentItem]] = None,
+    ) -> List[dict]:
         """
         Build vision content
 
@@ -218,7 +224,7 @@ class Vision:
 
         return content
 
-    def extract_urls(self, text: str) -> list:
+    def extract_urls(self, text: str) -> List[str]:
         """
         Extract img urls from text
 
@@ -260,7 +266,7 @@ class Vision:
         """Reset input tokens counter"""
         self.input_tokens = 0
 
-    def get_attachments(self) -> dict:
+    def get_attachments(self) -> Dict[str, str]:
         """
         Get attachments
 
@@ -268,7 +274,7 @@ class Vision:
         """
         return self.attachments
 
-    def get_urls(self) -> list:
+    def get_urls(self) -> List[str]:
         """
         Get urls
 

pygpt_net/provider/llms/anthropic.py

@@ -6,7 +6,7 @@
 # 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 22:00:00                  #
 # ================================================== #
 
 from llama_index.llms.anthropic import Anthropic
@@ -32,7 +32,12 @@ class AnthropicLLM(BaseLLM):
         self.id = "anthropic"
         self.type = [MODE_LLAMA_INDEX]
 
-    def llama(self, window, model: ModelItem, stream: bool = False) -> LlamaBaseLLM:
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
         """
         Return LLM provider instance for llama
 

pygpt_net/provider/llms/azure_openai.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 22:00:00                  #
 # ================================================== #
 
+from typing import Optional, List, Dict
+
 from langchain_openai import AzureOpenAI
 from langchain_openai import AzureChatOpenAI
 
@@ -39,7 +41,12 @@ class AzureOpenAILLM(BaseLLM):
         self.id = "azure_openai"
         self.type = [MODE_LANGCHAIN, MODE_LLAMA_INDEX, "embeddings"]
 
-    def completion(self, window, model: ModelItem, stream: bool = False):
+    def completion(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ):
         """
         Return LLM provider instance for completion
 
@@ -51,7 +58,12 @@ class AzureOpenAILLM(BaseLLM):
         args = self.parse_args(model.langchain)
         return AzureOpenAI(**args)
 
-    def chat(self, window, model: ModelItem, stream: bool = False):
+    def chat(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ):
         """
         Return LLM provider instance for chat
 
@@ -63,7 +75,12 @@ class AzureOpenAILLM(BaseLLM):
         args = self.parse_args(model.langchain)
         return AzureChatOpenAI(**args)
 
-    def llama(self, window, model: ModelItem, stream: bool = False) -> LlamaBaseLLM:
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
         """
         Return LLM provider instance for llama
 
@@ -75,7 +92,11 @@ class AzureOpenAILLM(BaseLLM):
         args = self.parse_args(model.llama_index)
         return LlamaAzureOpenAI(**args)
 
-    def get_embeddings_model(self, window, config: list = None) -> BaseEmbedding:
+    def get_embeddings_model(
+            self,
+            window,
+            config: Optional[List[Dict]] = None
+    ) -> BaseEmbedding:
         """
         Return provider instance for embeddings
 

pygpt_net/provider/llms/base.py

@@ -6,10 +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 22:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional, List, Dict
 
 from llama_index.core.base.embeddings.base import BaseEmbedding
 from llama_index.core.llms.llm import BaseLLM as LlamaBaseLLM
@@ -30,7 +31,13 @@ class BaseLLM:
         self.type = []  # langchain, llama_index, embeddings
         self.description = ""
 
-    def init(self, window, model: ModelItem, mode: str, sub_mode: str = None):
+    def init(
+            self,
+            window,
+            model: ModelItem,
+            mode: str,
+            sub_mode: str = None
+    ):
         """
         Initialize provider
 
@@ -53,7 +60,11 @@ class BaseLLM:
                 except Exception as e:
                     pass
 
-    def init_embeddings(self, window, env: list):
+    def init_embeddings(
+            self,
+            window,
+            env: Optional[List[Dict]] = None
+    ):
         """
         Initialize embeddings provider
 
@@ -69,7 +80,10 @@ class BaseLLM:
                 except Exception as e:
                     pass
 
-    def parse_args(self, options: dict) -> dict:
+    def parse_args(
+            self,
+            options: dict
+    ) -> dict:
         """
         Parse extra args
 
@@ -82,7 +96,12 @@ class BaseLLM:
                 args = parse_args(options['args'])
         return args
 
-    def completion(self, window, model: ModelItem, stream: bool = False) -> any:
+    def completion(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> any:
         """
         Return LLM provider instance for completion in langchain mode
 
@@ -93,7 +112,12 @@ class BaseLLM:
         """
         pass
 
-    def chat(self, window, model: ModelItem, stream: bool = False) -> any:
+    def chat(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> any:
         """
         Return LLM provider instance for chat in langchain mode
 
@@ -104,7 +128,12 @@ class BaseLLM:
         """
         pass
 
-    def llama(self, window, model: ModelItem, stream: bool = False) -> LlamaBaseLLM:
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
         """
         Return LLM provider instance for llama index query and chat
 
@@ -115,7 +144,12 @@ class BaseLLM:
         """
         pass
 
-    def llama_multimodal(self, window, model: ModelItem, stream: bool = False) -> LlamaMultiModalLLM:
+    def llama_multimodal(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaMultiModalLLM:
         """
         Return multimodal LLM provider instance for llama
 
@@ -126,7 +160,11 @@ class BaseLLM:
         """
         pass
 
-    def get_embeddings_model(self, window, config: list = None) -> BaseEmbedding:
+    def get_embeddings_model(
+            self,
+            window,
+            config: Optional[List[Dict]] = None
+    ) -> BaseEmbedding:
         """
         Return provider instance for embeddings
 

pygpt_net/provider/llms/google.py

@@ -6,7 +6,7 @@
 # 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 22:00:00                  #
 # ================================================== #
 
 from llama_index.llms.gemini import Gemini
@@ -32,7 +32,12 @@ class GoogleLLM(BaseLLM):
         self.id = "google"
         self.type = [MODE_LLAMA_INDEX]
 
-    def llama(self, window, model: ModelItem, stream: bool = False) -> LlamaBaseLLM:
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
         """
         Return LLM provider instance for llama
 

pygpt_net/provider/llms/hugging_face.py

@@ -6,7 +6,7 @@
 # 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 22:00:00                  #
 # ================================================== #
 
 from langchain_community.llms import HuggingFaceHub
@@ -24,7 +24,12 @@ class HuggingFaceLLM(BaseLLM):
         self.id = "huggingface"
         self.type = [MODE_LANGCHAIN]
 
-    def completion(self, window, model: ModelItem, stream: bool = False):
+    def completion(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ):
         """
         Return LLM provider instance for completion
 
@@ -36,7 +41,12 @@ class HuggingFaceLLM(BaseLLM):
         args = self.parse_args(model.langchain)
         return HuggingFaceHub(**args)
 
-    def chat(self, window, model: ModelItem, stream: bool = False):
+    def chat(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ):
         """
         Return LLM provider instance for chat
 

pygpt_net/provider/llms/hugging_face_api.py

@@ -6,10 +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 22:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional, List, Dict
 
 from pygpt_net.core.types import (
     MODE_LLAMA_INDEX,
@@ -28,7 +29,12 @@ class HuggingFaceApiLLM(BaseLLM):
         self.id = "huggingface_api"
         self.type = [MODE_LLAMA_INDEX, "embeddings"]
 
-    def llama(self, window, model: ModelItem, stream: bool = False) -> LlamaBaseLLM:
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
         """
         Return LLM provider instance for llama
 
@@ -40,7 +46,11 @@ class HuggingFaceApiLLM(BaseLLM):
         args = self.parse_args(model.llama_index)
         return HuggingFaceInferenceAPI(**args)
 
-    def get_embeddings_model(self, window, config: list = None) -> BaseEmbedding:
+    def get_embeddings_model(
+            self,
+            window,
+            config: Optional[List[Dict]] = None
+    ) -> BaseEmbedding:
         """
         Return provider instance for embeddings
 
@@ -55,7 +65,11 @@ class HuggingFaceApiLLM(BaseLLM):
             })
         return HuggingFaceAPIEmbedding(**args)
 
-    def init_embeddings(self, window, env: list):
+    def init_embeddings(
+            self,
+            window,
+            env: Optional[List[Dict]] = None
+    ):
         """
         Initialize embeddings provider
 

pygpt_net/provider/llms/local.py

@@ -6,7 +6,7 @@
 # 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 22:00:00                  #
 # ================================================== #
 
 from llama_index.llms.openai_like import OpenAILike
@@ -25,7 +25,12 @@ class LocalLLM(BaseLLM):
         self.id = "local_ai"
         self.type = [MODE_LLAMA_INDEX]
 
-    def llama(self, window, model: ModelItem, stream: bool = False) -> LlamaBaseLLM:
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
         """
         Return LLM provider instance for llama
 

pygpt_net/provider/llms/ollama.py

@@ -6,10 +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 22:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional, List, Dict
 
 from langchain_community.chat_models import ChatOllama
 
@@ -33,7 +34,12 @@ class OllamaLLM(BaseLLM):
         self.id = "ollama"
         self.type = [MODE_LANGCHAIN, MODE_LLAMA_INDEX, "embeddings"]
 
-    def completion(self, window, model: ModelItem, stream: bool = False):
+    def completion(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ):
         """
         Return LLM provider instance for completion
 
@@ -44,7 +50,12 @@ class OllamaLLM(BaseLLM):
         """
         return None
 
-    def chat(self, window, model: ModelItem, stream: bool = False):
+    def chat(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ):
         """
         Return LLM provider instance for chat
 
@@ -56,7 +67,12 @@ class OllamaLLM(BaseLLM):
         args = self.parse_args(model.langchain)
         return ChatOllama(**args)
 
-    def llama(self, window, model: ModelItem, stream: bool = False) -> LlamaBaseLLM:
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
         """
         Return LLM provider instance for llama
 
@@ -69,7 +85,11 @@ class OllamaLLM(BaseLLM):
         args = self.parse_args(model.llama_index)
         return Ollama(**args)
 
-    def get_embeddings_model(self, window, config: list = None) -> BaseEmbedding:
+    def get_embeddings_model(
+            self,
+            window,
+            config: Optional[List[Dict]] = None
+    ) -> BaseEmbedding:
         """
         Return provider instance for embeddings
 
@@ -84,7 +104,11 @@ class OllamaLLM(BaseLLM):
             })
         return OllamaEmbedding(**args)
 
-    def init_embeddings(self, window, env: list):
+    def init_embeddings(
+            self,
+            window,
+            env: Optional[List[Dict]] = None
+    ):
         """
         Initialize embeddings provider
 

pygpt_net/provider/llms/openai.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 22:00:00                  #
 # ================================================== #
 
+from typing import Optional, List, Dict
+
 from langchain_openai import OpenAI
 from langchain_openai import ChatOpenAI
 
@@ -33,7 +35,12 @@ class OpenAILLM(BaseLLM):
         self.id = "openai"
         self.type = [MODE_LANGCHAIN, MODE_LLAMA_INDEX, "embeddings"]
 
-    def completion(self, window, model: ModelItem, stream: bool = False):
+    def completion(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ):
         """
         Return LLM provider instance for completion
 
@@ -45,7 +52,12 @@ class OpenAILLM(BaseLLM):
         args = self.parse_args(model.langchain)
         return OpenAI(**args)
 
-    def chat(self, window, model: ModelItem, stream: bool = False):
+    def chat(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ):
         """
         Return LLM provider instance for chat
 
@@ -57,7 +69,12 @@ class OpenAILLM(BaseLLM):
         args = self.parse_args(model.langchain)
         return ChatOpenAI(**args)
 
-    def llama(self, window, model: ModelItem, stream: bool = False) -> LlamaBaseLLM:
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
         """
         Return LLM provider instance for llama
 
@@ -69,7 +86,12 @@ class OpenAILLM(BaseLLM):
         args = self.parse_args(model.llama_index)
         return LlamaOpenAI(**args)
 
-    def llama_multimodal(self, window, model: ModelItem, stream: bool = False) -> LlamaMultiModalLLM:
+    def llama_multimodal(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaMultiModalLLM:
         """
         Return multimodal LLM provider instance for llama
 
@@ -81,7 +103,11 @@ class OpenAILLM(BaseLLM):
         args = self.parse_args(model.llama_index)
         return LlamaOpenAIMultiModal(**args)
 
-    def get_embeddings_model(self, window, config: list = None) -> BaseEmbedding:
+    def get_embeddings_model(
+            self,
+            window,
+            config: Optional[List[Dict]] = None
+    ) -> BaseEmbedding:
         """
         Return provider instance for embeddings