pygpt-net 2.6.24__py3-none-any.whl → 2.6.26__py3-none-any.whl

pygpt_net/provider/llms/deepseek_api.py

@@ -6,9 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.06 01:00:00                  #
+# Updated Date: 2025.08.26 19:00:00                  #
 # ================================================== #
-from typing import List, Dict
+
+from typing import List, Dict, Optional
+
+from llama_index.core.base.embeddings.base import BaseEmbedding
 
 from pygpt_net.core.types import (
     MODE_LLAMA_INDEX,
@@ -24,7 +27,7 @@ class DeepseekApiLLM(BaseLLM):
         super(DeepseekApiLLM, self).__init__(*args, **kwargs)
         self.id = "deepseek_api"
         self.name = "Deepseek API"
-        self.type = [MODE_LLAMA_INDEX]
+        self.type = [MODE_LLAMA_INDEX, "embeddings"]
 
     def llama(
             self,
@@ -42,8 +45,38 @@ class DeepseekApiLLM(BaseLLM):
         """
         from llama_index.llms.deepseek import DeepSeek
         args = self.parse_args(model.llama_index, window)
+        if "model" not in args:
+            args["model"] = model.id
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_deepseek", "")
         return DeepSeek(**args)
 
+    def get_embeddings_model(
+            self,
+            window,
+            config: Optional[List[Dict]] = None
+    ) -> BaseEmbedding:
+        """
+        Return provider instance for embeddings
+
+        :param window: window instance
+        :param config: config keyword arguments list
+        :return: Embedding provider instance
+        """
+        from llama_index.embeddings.voyageai import VoyageEmbedding
+        args = {}
+        if config is not None:
+            args = self.parse_args({
+                "args": config,
+            }, window)
+        if "api_key" in args:
+            args["voyage_api_key"] = args.pop("api_key")
+        if "voyage_api_key" not in args or args["voyage_api_key"] == "":
+            args["voyage_api_key"] = window.core.config.get("api_key_voyage", "")
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
+        return VoyageEmbedding(**args)
+
     def get_models(
             self,
             window,

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: 2025.08.06 01:00:00                  #
+# Updated Date: 2025.08.26 19:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
@@ -53,6 +53,8 @@ class GoogleLLM(BaseLLM):
         args = self.parse_args(model.llama_index, window)
         if "model" not in args:
             args["model"] = model.id
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_google", "")
         return GoogleGenAI(**args)
 
     def get_embeddings_model(
@@ -73,6 +75,10 @@ class GoogleLLM(BaseLLM):
             args = self.parse_args({
                 "args": config,
             }, window)
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_google", "")
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
         return GoogleGenAIEmbedding(**args)
 
     def get_models(

pygpt_net/provider/llms/hugging_face_api.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.06 01:00:00                  #
+# Updated Date: 2025.08.26 19:00:00                  #
 # ================================================== #
 
 import os
@@ -47,6 +47,8 @@ class HuggingFaceApiLLM(BaseLLM):
         args = self.parse_args(model.llama_index, window)
         if "model" not in args:
             args["model"] = model.id
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_hugging_face", "")
         return HuggingFaceInferenceAPI(**args)
 
     def get_embeddings_model(
@@ -61,13 +63,17 @@ class HuggingFaceApiLLM(BaseLLM):
         :param config: config keyword arguments list
         :return: Embedding provider instance
         """
-        from llama_index.embeddings.huggingface_api import HuggingFaceInferenceAPIEmbedding as HuggingFaceAPIEmbedding
+        from llama_index.embeddings.huggingface_api import HuggingFaceInferenceAPIEmbedding
         args = {}
         if config is not None:
             args = self.parse_args({
                 "args": config,
             }, window)
-        return HuggingFaceAPIEmbedding(**args)
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_hugging_face", "")
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
+        return HuggingFaceInferenceAPIEmbedding(**args)
 
     def init_embeddings(
             self,

pygpt_net/provider/llms/hugging_face_router.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.08 19:00:00                  #
+# Updated Date: 2025.08.26 19:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
@@ -28,7 +28,7 @@ class HuggingFaceRouterLLM(BaseLLM):
         super(HuggingFaceRouterLLM, self).__init__(*args, **kwargs)
         self.id = "huggingface_router"
         self.name = "HuggingFace Router"
-        self.type = [MODE_CHAT, MODE_LLAMA_INDEX]
+        self.type = [MODE_CHAT, MODE_LLAMA_INDEX, "embeddings"]
 
     def completion(
             self,
@@ -78,6 +78,10 @@ class HuggingFaceRouterLLM(BaseLLM):
         """
         from llama_index.llms.openai_like import OpenAILike
         args = self.parse_args(model.llama_index, window)
+        if "model" not in args:
+            args["model"] = model.id
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_hugging_face", "")
         return OpenAILike(**args)
 
     def llama_multimodal(
@@ -108,7 +112,17 @@ class HuggingFaceRouterLLM(BaseLLM):
         :param config: config keyword arguments list
         :return: Embedding provider instance
         """
-        pass
+        from llama_index.embeddings.huggingface_api import HuggingFaceInferenceAPIEmbedding
+        args = {}
+        if config is not None:
+            args = self.parse_args({
+                "args": config,
+            }, window)
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_hugging_face", "")
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
+        return HuggingFaceInferenceAPIEmbedding(**args)
 
     def get_models(
             self,

pygpt_net/provider/llms/llama_index/x_ai/embedding.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2025.08.26 19:00:00                  #
+# ================================================== #
+
+import asyncio
+from typing import Any, List, Optional
+
+import xai_sdk
+from llama_index.core.embeddings import BaseEmbedding
+
+
+class XAIEmbedding(BaseEmbedding):
+    """
+    LlamaIndex xAI Embedding SDK wrapper.
+    """
+
+    def __init__(
+        self,
+        model_name: str,
+        api_key: Optional[str] = None,
+        api_host: str = "api.x.ai",
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(model_name=model_name, **kwargs)
+        self._api_key = api_key
+        self._api_host = api_host
+        self._client = xai_sdk.Client(api_key=api_key, api_host=api_host)
+
+    def _run_async(self, coro):
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = None
+
+        if loop and loop.is_running():
+            return asyncio.run_coroutine_threadsafe(coro, loop).result()
+        else:
+            return asyncio.run(coro)
+
+    async def _aembed_many(self, texts: List[str]) -> List[List[float]]:
+        embeddings: List[List[float]] = []
+        async for (values, _shape) in self._client.embedder.embed(
+            texts=texts, model_name=self.model_name
+        ):
+            embeddings.append(list(values))
+        return embeddings
+
+    def _get_query_embedding(self, query: str) -> List[float]:
+        return self._run_async(self._aembed_many([query]))[0]
+
+    async def _aget_query_embedding(self, query: str) -> List[float]:
+        return (await self._aembed_many([query]))[0]
+
+    def _get_text_embedding(self, text: str) -> List[float]:
+        return self._run_async(self._aembed_many([text]))[0]
+
+    async def _aget_text_embedding(self, text: str) -> List[float]:
+        return (await self._aembed_many([text]))[0]
+
+    def _get_text_embeddings(self, texts: List[str]) -> List[List[float]]:
+        return self._run_async(self._aembed_many(texts))
+
+    async def _aget_text_embeddings(self, texts: List[str]) -> List[List[float]]:
+        return await self._aembed_many(texts)

pygpt_net/provider/llms/local.py

@@ -8,7 +8,9 @@
 # Created By  : Marcin Szczygliński                  #
 # Updated Date: 2025.08.06 01:00:00                  #
 # ================================================== #
+from typing import Optional, Dict, List
 
+from llama_index.core.base.embeddings.base import BaseEmbedding
 from llama_index.core.llms.llm import BaseLLM as LlamaBaseLLM
 
 from pygpt_net.core.types import (
@@ -23,7 +25,29 @@ class LocalLLM(BaseLLM):
         super(LocalLLM, self).__init__(*args, **kwargs)
         self.id = "local_ai"
         self.name = "Local model (OpenAI API compatible)"
-        self.type = [MODE_LLAMA_INDEX]
+        self.type = [MODE_LLAMA_INDEX, "embeddings"]
+
+    def get_embeddings_model(
+            self,
+            window,
+            config: Optional[List[Dict]] = None
+    ) -> BaseEmbedding:
+        """
+        Return provider instance for embeddings
+
+        :param window: window instance
+        :param config: config keyword arguments list
+        :return: Embedding provider instance
+        """
+        from llama_index.embeddings.openai_like import OpenAILikeEmbedding
+        args = {}
+        if config is not None:
+            args = self.parse_args({
+                "args": config,
+            }, window)
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
+        return OpenAILikeEmbedding(**args)
 
     def llama(
             self,
@@ -41,4 +65,10 @@ class LocalLLM(BaseLLM):
         """
         from llama_index.llms.openai_like import OpenAILike
         args = self.parse_args(model.llama_index, window)
+        if "model" not in args:
+            args["model"] = model.id
+        if "is_chat_model" not in args:
+            args["is_chat_model"] = True
+        if "is_function_calling_model" not in args:
+            args["is_function_calling_model"] = model.tool_calls
         return OpenAILike(**args)

pygpt_net/provider/llms/mistral.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.06 01:00:00                  #
+# Updated Date: 2025.08.26 19:00:00                  #
 # ================================================== #
 
 import os
@@ -47,6 +47,8 @@ class MistralAILLM(BaseLLM):
         args = self.parse_args(model.llama_index, window)
         if "model" not in args:
             args["model"] = model.id
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_mistral", "")
         return MistralAI(**args)
 
     def get_embeddings_model(
@@ -67,6 +69,10 @@ class MistralAILLM(BaseLLM):
             args = self.parse_args({
                 "args": config,
             }, window)
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_mistral", "")
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
         return MistralAIEmbedding(**args)
 
     def init_embeddings(
@@ -87,3 +93,25 @@ class MistralAILLM(BaseLLM):
         if ('OPENAI_API_KEY' not in os.environ
                 and (window.core.config.get('api_key') is None or window.core.config.get('api_key') == "")):
             os.environ['OPENAI_API_KEY'] = "_"
+
+    def get_models(
+            self,
+            window,
+    ) -> List[Dict]:
+        """
+        Return list of models for the provider
+
+        :param window: window instance
+        :return: list of models
+        """
+        items = []
+        client = self.get_client(window)
+        models_list = client.models.list()
+        if models_list.data:
+            for item in models_list.data:
+                id = item.id
+                items.append({
+                    "id": id,
+                    "name": id,
+                })
+        return items

pygpt_net/provider/llms/ollama.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.06 01:00:00                  #
+# Updated Date: 2025.08.26 19:00:00                  #
 # ================================================== #
 
 import os
@@ -118,6 +118,8 @@ class OllamaLLM(BaseLLM):
         if 'OLLAMA_API_BASE' in os.environ:
             if "base_url" not in args:
                 args["base_url"] = os.environ['OLLAMA_API_BASE']
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
         return OllamaEmbedding(**args)
 
     def init_embeddings(

pygpt_net/provider/llms/open_router.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2025.08.26 23:00:00                  #
+# ================================================== #
+
+from typing import Optional, Dict, List
+
+from llama_index.core.base.embeddings.base import BaseEmbedding
+from llama_index.core.llms.llm import BaseLLM as LlamaBaseLLM
+
+from pygpt_net.core.types import (
+    MODE_LLAMA_INDEX,
+)
+from pygpt_net.provider.llms.base import BaseLLM
+from pygpt_net.item.model import ModelItem
+
+
+class OpenRouterLLM(BaseLLM):
+    def __init__(self, *args, **kwargs):
+        super(OpenRouterLLM, self).__init__(*args, **kwargs)
+        self.id = "open_router"
+        self.name = "OpenRouter"
+        self.type = [MODE_LLAMA_INDEX, "embeddings"]
+
+    def get_embeddings_model(
+            self,
+            window,
+            config: Optional[List[Dict]] = None
+    ) -> BaseEmbedding:
+        """
+        Return provider instance for embeddings
+
+        :param window: window instance
+        :param config: config keyword arguments list
+        :return: Embedding provider instance
+        """
+        from llama_index.embeddings.openai_like import OpenAILikeEmbedding
+        args = {}
+        if config is not None:
+            args = self.parse_args({
+                "args": config,
+            }, window)
+        if "api_key" not in args:
+            args["api_key"] = window.core.config.get("api_key_open_router", "")
+        if "api_base" not in args:
+            args["api_base"] = window.core.config.get("api_endpoint_open_router", "")
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
+        return OpenAILikeEmbedding(**args)
+
+    def llama(
+            self,
+            window,
+            model: ModelItem,
+            stream: bool = False
+    ) -> LlamaBaseLLM:
+        """
+        Return LLM provider instance for llama
+
+        :param window: window instance
+        :param model: model instance
+        :param stream: stream mode
+        :return: LLM provider instance
+        """
+        from llama_index.llms.openai_like import OpenAILike
+        args = self.parse_args(model.llama_index, window)
+        if "model" not in args:
+            args["model"] = model.id
+        if "api_key" not in args:
+            args["api_key"] = window.core.config.get("api_key_open_router", "")
+        if "api_base" not in args:
+            args["api_base"] = window.core.config.get("api_endpoint_open_router", "")
+        if "is_chat_model" not in args:
+            args["is_chat_model"] = True
+        if "is_function_calling_model" not in args:
+            args["is_function_calling_model"] = model.tool_calls
+        return OpenAILike(**args)
+
+    def get_models(
+            self,
+            window,
+    ) -> List[Dict]:
+        """
+        Return list of models for the provider
+
+        :param window: window instance
+        :return: list of models
+        """
+        items = []
+        client = self.get_client(window)
+        models_list = client.models.list()
+        if models_list.data:
+            for item in models_list.data:
+                items.append({
+                    "id": item.id,
+                    "name": item.id,
+                })
+        return items

pygpt_net/provider/llms/openai.py

@@ -6,10 +6,9 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.06 01:00:00                  #
+# Updated Date: 2025.08.26 19:00:00                  #
 # ================================================== #
 
-import json
 from typing import Optional, List, Dict
 
 # from langchain_openai import OpenAI
@@ -93,6 +92,8 @@ class OpenAILLM(BaseLLM):
         from .llama_index.openai import OpenAI as LlamaOpenAI
         from .llama_index.openai import OpenAIResponses as LlamaOpenAIResponses
         args = self.parse_args(model.llama_index, window)
+        if "api_key" not in args:
+            args["api_key"] = window.core.config.get("api_key", "")
         if "model" not in args:
             args["model"] = model.id
 
@@ -148,6 +149,10 @@ class OpenAILLM(BaseLLM):
             args = self.parse_args({
                 "args": config,
             }, window)
+        if "api_key" not in args:
+            args["api_key"] = window.core.config.get("api_key", "")
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
         return OpenAIEmbedding(**args)
 
     def get_models(

pygpt_net/provider/llms/x_ai.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.06 01:00:00                  #
+# Updated Date: 2025.08.26 19:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
@@ -28,7 +28,7 @@ class xAILLM(BaseLLM):
         super(xAILLM, self).__init__(*args, **kwargs)
         self.id = "x_ai"
         self.name = "xAI"
-        self.type = [MODE_CHAT, MODE_LLAMA_INDEX]
+        self.type = [MODE_CHAT, MODE_LLAMA_INDEX, "embeddings"]
 
     def completion(
             self,
@@ -78,6 +78,12 @@ class xAILLM(BaseLLM):
         """
         from llama_index.llms.openai_like import OpenAILike
         args = self.parse_args(model.llama_index, window)
+        if "model" not in args:
+            args["model"] = model.id
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_xai", "")
+        if "api_base" not in args or args["api_base"] == "":
+            args["api_base"] = window.core.config.get("api_endpoint_xai", "https://api.x.ai/v1")
         return OpenAILike(**args)
 
     def llama_multimodal(
@@ -108,7 +114,17 @@ class xAILLM(BaseLLM):
         :param config: config keyword arguments list
         :return: Embedding provider instance
         """
-        pass
+        from .llama_index.x_ai.embedding import XAIEmbedding
+        args = {}
+        if config is not None:
+            args = self.parse_args({
+                "args": config,
+            }, window)
+        if "api_key" not in args or args["api_key"] == "":
+            args["api_key"] = window.core.config.get("api_key_xai", "")
+        if "model" in args and "model_name" not in args:
+            args["model_name"] = args.pop("model")
+        return XAIEmbedding(**args)
 
     def get_models(
             self,