pygpt-net 2.6.44__py3-none-any.whl → 2.6.46__py3-none-any.whl

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.26 19:00:00                  #
+# Updated Date: 2025.09.15 01:00:00                  #
 # ================================================== #
 
 import os
@@ -44,12 +44,41 @@ class MistralAILLM(BaseLLM):
         :return: LLM provider instance
         """
         from llama_index.llms.mistralai import MistralAI
+        class MistralAIWithProxy(MistralAI):
+            def __init__(self, *args, proxy: Optional[str] = None, **kwargs):
+                endpoint = kwargs.get("endpoint")
+                super().__init__(*args, **kwargs)
+                if not proxy:
+                    return
+
+                import httpx
+                from mistralai import Mistral
+                timeout = getattr(self, "timeout", 120)
+
+                try:
+                    sync_client = httpx.Client(proxy=proxy, timeout=timeout, follow_redirects=True)
+                    async_client = httpx.AsyncClient(proxy=proxy, timeout=timeout, follow_redirects=True)
+                except TypeError:
+                    sync_client = httpx.Client(proxies=proxy, timeout=timeout, follow_redirects=True)
+                    async_client = httpx.AsyncClient(proxies=proxy, timeout=timeout, follow_redirects=True)
+
+                sdk_kwargs = {
+                    "api_key": self.api_key,
+                    "client": sync_client,
+                    "async_client": async_client,
+                }
+                if endpoint:
+                    sdk_kwargs["server_url"] = endpoint
+
+                self._client = Mistral(**sdk_kwargs)
+
         args = self.parse_args(model.llama_index, window)
+        proxy = window.core.config.get("api_proxy") or None
         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)
+        return MistralAIWithProxy(**args, proxy=proxy)
 
     def get_embeddings_model(
             self,
@@ -64,6 +93,32 @@ class MistralAILLM(BaseLLM):
         :return: Embedding provider instance
         """
         from llama_index.embeddings.mistralai import MistralAIEmbedding
+        class MistralAIEmbeddingWithProxy(MistralAIEmbedding):
+            def __init__(self, *args, proxy: Optional[str] = None, api_key: Optional[str] = None, **kwargs):
+                captured_key = api_key or os.environ.get("MISTRAL_API_KEY", "")
+                super().__init__(*args, api_key=api_key, **kwargs)
+
+                if not proxy:
+                    return
+
+                import httpx
+                try:
+                    sync_client = httpx.Client(proxy=proxy, timeout=60.0, follow_redirects=True)
+                    async_client = httpx.AsyncClient(proxy=proxy, timeout=60.0, follow_redirects=True)
+                except TypeError:
+                    sync_client = httpx.Client(proxies=proxy, timeout=60.0, follow_redirects=True)
+                    async_client = httpx.AsyncClient(proxies=proxy, timeout=60.0, follow_redirects=True)
+
+                from mistralai import Mistral
+                server_url = os.environ.get("MISTRAL_ENDPOINT") or None
+                self._client = Mistral(
+                    api_key=captured_key,
+                    client=sync_client,
+                    async_client=async_client,
+                    **({"server_url": server_url} if server_url else {}),
+                )
+                if hasattr(self, "_mistralai_client"):
+                    self._mistralai_client = self._client
         args = {}
         if config is not None:
             args = self.parse_args({
@@ -73,7 +128,9 @@ class MistralAILLM(BaseLLM):
             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)
+
+        proxy = window.core.config.get("api_proxy") or None
+        return MistralAIEmbeddingWithProxy(**args, proxy=proxy)
 
     def init_embeddings(
             self,

pygpt_net/provider/llms/open_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.26 23:00:00                  #
+# Updated Date: 2025.09.15 01:00:00                  #
 # ================================================== #
 
 from typing import Optional, Dict, List
@@ -52,6 +52,7 @@ class OpenRouterLLM(BaseLLM):
             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")
+        args = self.inject_llamaindex_http_clients(args, window.core.config)
         return OpenAILikeEmbedding(**args)
 
     def llama(
@@ -80,6 +81,7 @@ class OpenRouterLLM(BaseLLM):
             args["is_chat_model"] = True
         if "is_function_calling_model" not in args:
             args["is_function_calling_model"] = model.tool_calls
+        args = self.inject_llamaindex_http_clients(args, window.core.config)
         return OpenAILike(**args)
 
     def get_models(
@@ -101,4 +103,4 @@ class OpenRouterLLM(BaseLLM):
                     "id": item.id,
                     "name": item.id,
                 })
-        return items
+        return items

pygpt_net/provider/llms/openai.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.26 19:00:00                  #
+# Updated Date: 2025.09.15 01:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
@@ -97,6 +97,7 @@ class OpenAILLM(BaseLLM):
         if "model" not in args:
             args["model"] = model.id
 
+        args = self.inject_llamaindex_http_clients(args, window.core.config)
         if window.core.config.get('api_use_responses_llama', False):
             tools = []
             tools = window.core.api.openai.remote_tools.append_to_tools(
@@ -153,6 +154,8 @@ class OpenAILLM(BaseLLM):
             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")
+
+        args = self.inject_llamaindex_http_clients(args, window.core.config)
         return OpenAIEmbedding(**args)
 
     def get_models(

pygpt_net/provider/llms/perplexity.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.09.15 01:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
@@ -69,7 +69,7 @@ class PerplexityLLM(BaseLLM):
             stream: bool = False
     ) -> LlamaBaseLLM:
         """
-        Return LLM provider instance for llama
+        Return LLM provider instance for llama (Perplexity)
 
         :param window: window instance
         :param model: model instance
@@ -77,12 +77,73 @@ class PerplexityLLM(BaseLLM):
         :return: LLM provider instance
         """
         from llama_index.llms.perplexity import Perplexity as LlamaPerplexity
+        from .utils import ProxyEnv
+
+        cfg = window.core.config
         args = self.parse_args(model.llama_index, window)
-        if "api_key" not in args:
-            args["api_key"] = window.core.config.get("api_key_perplexity", "")
+
+        if "api_key" not in args or not args["api_key"]:
+            args["api_key"] = cfg.get("api_key_perplexity", "")
         if "model" not in args:
             args["model"] = model.id
-        return LlamaPerplexity(**args)
+
+        custom_base = cfg.get("api_endpoint_perplexity", "").strip()
+        if custom_base and "api_base" not in args:
+            args["api_base"] = custom_base
+
+        # httpx.Client/AsyncClient (proxy, timeout, socks etc.)
+        try:
+            args_injected = self.inject_llamaindex_http_clients(dict(args), cfg)
+            return LlamaPerplexity(**args_injected)
+        except TypeError:
+            return LlamaPerplexity(**args)
+
+        # -----------------------------------
+        # TODO: fallback
+        proxy = cfg.get("api_proxy") or cfg.get("api_native_perplexity.proxy")
+
+        class PerplexityWithProxy(LlamaPerplexity):
+            def __init__(self, *a, **kw):
+                super().__init__(*a, **kw)
+                self._proxy = proxy
+
+            # sync
+            def complete(self, *a, **kw):
+                with ProxyEnv(self._proxy):
+                    return super().complete(*a, **kw)
+
+            def chat(self, *a, **kw):
+                with ProxyEnv(self._proxy):
+                    return super().chat(*a, **kw)
+
+            def stream_complete(self, *a, **kw):
+                with ProxyEnv(self._proxy):
+                    return super().stream_complete(*a, **kw)
+
+            def stream_chat(self, *a, **kw):
+                with ProxyEnv(self._proxy):
+                    return super().stream_chat(*a, **kw)
+
+            # async
+            async def acomplete(self, *a, **kw):
+                with ProxyEnv(self._proxy):
+                    return await super().acomplete(*a, **kw)
+
+            async def achat(self, *a, **kw):
+                with ProxyEnv(self._proxy):
+                    return await super().achat(*a, **kw)
+
+            async def astream_complete(self, *a, **kw):
+                with ProxyEnv(self._proxy):
+                    async for chunk in super().astream_complete(*a, **kw):
+                        yield chunk
+
+            async def astream_chat(self, *a, **kw):
+                with ProxyEnv(self._proxy):
+                    async for chunk in super().astream_chat(*a, **kw):
+                        yield chunk
+
+        return PerplexityWithProxy(**args)
 
     def llama_multimodal(
             self,

pygpt_net/provider/llms/utils.py

@@ -0,0 +1,39 @@
+#!/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.09.15 01:00:00                  #
+# ================================================== #
+
+import os
+from contextlib import ContextDecorator
+from typing import Optional
+
+class ProxyEnv(ContextDecorator):
+    def __init__(self, proxy: Optional[str]):
+        self.proxy = proxy
+        self._saved = {}
+
+    def __enter__(self):
+        if not self.proxy:
+            return self
+        for key in ("HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY"):
+            self._saved[key] = os.environ.get(key)
+        os.environ["HTTP_PROXY"] = self.proxy
+        os.environ["HTTPS_PROXY"] = self.proxy
+        os.environ["ALL_PROXY"] = self.proxy
+        return self
+
+    def __exit__(self, exc_type, exc, tb):
+        if not self.proxy:
+            return False
+        for key, val in self._saved.items():
+            if val is None:
+                os.environ.pop(key, None)
+            else:
+                os.environ[key] = val
+        return False

pygpt_net/provider/llms/voyage.py

@@ -0,0 +1,50 @@
+#!/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.09.15 01:00:00                  #
+# ================================================== #
+
+from typing import Optional, List
+import voyageai
+from llama_index.embeddings.voyageai import VoyageEmbedding
+from .utils import ProxyEnv
+
+class VoyageEmbeddingWithProxy(VoyageEmbedding):
+    def __init__(
+        self,
+        *args,
+        proxy: Optional[str] = None,
+        voyage_api_key: Optional[str] = None,
+        timeout: Optional[float] = None,
+        max_retries: Optional[int] = None,
+        **kwargs
+    ):
+        super().__init__(*args, voyage_api_key=voyage_api_key, **kwargs)
+        self._proxy = proxy
+
+        if timeout is not None or max_retries is not None:
+            self._client = voyageai.Client(
+                api_key=voyage_api_key,
+                timeout=timeout,
+                max_retries=max_retries,
+            )
+            self._aclient = voyageai.AsyncClient(
+                api_key=voyage_api_key,
+                timeout=timeout,
+                max_retries=max_retries,
+            )
+
+    # sync batch
+    def get_text_embedding_batch(self, texts: List[str], show_progress: bool = False, **kwargs):
+        with ProxyEnv(self._proxy):
+            return super().get_text_embedding_batch(texts, show_progress=show_progress, **kwargs)
+
+    # async batch
+    async def aget_text_embedding_batch(self, texts: List[str], show_progress: bool = False):
+        with ProxyEnv(self._proxy):
+            return await super().aget_text_embedding_batch(texts, show_progress=show_progress)

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.26 19:00:00                  #
+# Updated Date: 2025.09.15 01:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
@@ -84,6 +84,11 @@ class xAILLM(BaseLLM):
             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")
+        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
+        args = self.inject_llamaindex_http_clients(args, window.core.config)
         return OpenAILike(**args)
 
     def llama_multimodal(
@@ -108,23 +113,78 @@ class xAILLM(BaseLLM):
             config: Optional[List[Dict]] = None
     ) -> BaseEmbedding:
         """
-        Return provider instance for embeddings
+        Return provider instance for embeddings (xAI)
 
         :param window: window instance
         :param config: config keyword arguments list
         :return: Embedding provider instance
         """
-        from .llama_index.x_ai.embedding import XAIEmbedding
-        args = {}
+        from .llama_index.x_ai.embedding import XAIEmbedding as BaseXAIEmbedding
+
+        cfg = window.core.config
+
+        args: Dict = {}
         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", "")
+            args = self.parse_args({"args": config}, window)
+
+        if "api_key" not in args or not args["api_key"]:
+            args["api_key"] = cfg.get("api_key_xai", "")
+
         if "model" in args and "model_name" not in args:
             args["model_name"] = args.pop("model")
-        return XAIEmbedding(**args)
+
+        # if OpenAI-compatible
+        if "api_base" not in args or not args["api_base"]:
+            args["api_base"] = cfg.get("api_endpoint_xai", "https://api.x.ai/v1")
+
+        proxy = cfg.get("api_proxy") or cfg.get("api_native_xai.proxy")
+        timeout = cfg.get("api_native_xai.timeout")
+
+        # 1) REST (OpenAI-compatible)
+        try_args = dict(args)
+        try:
+            try_args = self.inject_llamaindex_http_clients(try_args, cfg)
+            return BaseXAIEmbedding(**try_args)
+        except TypeError:
+            # goto gRPC
+            pass
+
+        # 2) Fallback: gRPC (xai_sdk)
+        def _build_xai_grpc_client(api_key: str, proxy_url: Optional[str], timeout_val: Optional[float]):
+            import os
+            import xai_sdk
+            kwargs = {"api_key": api_key}
+            if timeout_val is not None:
+                kwargs["timeout"] = timeout_val
+
+            # channel_options - 'grpc.http_proxy'
+            if proxy_url:
+                try:
+                    kwargs["channel_options"] = [("grpc.http_proxy", proxy_url)]
+                except TypeError:
+                    # ENV
+                    os.environ["grpc_proxy"] = proxy_url
+
+            try:
+                return xai_sdk.Client(**kwargs)
+            except TypeError:
+                if proxy_url:
+                    os.environ["grpc_proxy"] = proxy_url
+                return xai_sdk.Client(api_key=api_key)
+
+        xai_client = _build_xai_grpc_client(args.get("api_key", ""), proxy, timeout)
+
+        # gRPC
+        class XAIEmbeddingWithProxy(BaseXAIEmbedding):
+            def __init__(self, *a, injected_client=None, **kw):
+                super().__init__(*a, **kw)
+                if injected_client is not None:
+                    for attr in ("client", "_client", "_xai_client"):
+                        if hasattr(self, attr):
+                            setattr(self, attr, injected_client)
+                            break
+
+        return XAIEmbeddingWithProxy(**args, injected_client=xai_client)
 
     def get_models(
             self,

pygpt_net/ui/layout/chat/output.py

@@ -118,7 +118,7 @@ class Output:
 
         nodes['inline.vision'] = HelpLabel(trans('inline.vision'))
         nodes['inline.vision'].setVisible(False)
-        nodes['inline.vision'].setContentsMargins(0, 0, 0, 0)
+        nodes['inline.vision'].setContentsMargins(3, 2, 0, 0)
 
         opts_layout = QHBoxLayout()
         opts_layout.setContentsMargins(0, 0, 0, 0)

pygpt_net/ui/widget/lists/db.py

@@ -79,6 +79,7 @@ class DatabaseList(QTableView):
         self.customContextMenuRequested.connect(
             lambda: self.create_context_menu(self)
         )
+        self.setProperty("class", "DebugList")
 
     def on_data_begin(self):
         """

pygpt_net/ui/widget/lists/debug.py

@@ -41,6 +41,7 @@ class DebugList(QTableView):
         self.setContextMenuPolicy(Qt.CustomContextMenu)
         self.customContextMenuRequested.connect(
             lambda: self.create_context_menu(self))
+        self.setProperty("class", "DebugList")
 
     def on_data_begin(self):
         """

pygpt_net/ui/widget/tabs/body.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.09.14 20:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -55,6 +55,17 @@ class TabBody(QTabWidget):
                 ref.deleteLater()
         del self.refs[:]
 
+    def delete_ref(self, widget: Any) -> None:
+        """
+        Unpin reference to widget in this tab
+
+        :param widget: widget reference
+        """
+        for ref in self.refs:
+            if ref and ref is widget:
+                self.refs.remove(ref)
+                break
+
     def append(self, body: QWidget):
         """
         Append tab body (parent widget)

pygpt_net/ui/widget/textarea/web.py

@@ -505,10 +505,10 @@ class Bridge(QObject):
         super(Bridge, self).__init__(parent)
         self.window = window
 
-    chunk = Signal(str, str)  # name, chunk
-    node = Signal(str)  # content
-    nodeReplace = Signal(str)  # content
-    nodeInput = Signal(str)  # content
+    chunk = Signal(str, str, str)  # name, chunk, type
+    node = Signal(str)  # JSON payload
+    nodeReplace = Signal(str)  # JSON payload
+    nodeInput = Signal(str)  # raw text
     readyChanged = Signal(bool)
 
     @Slot(int)

pygpt_net/utils.py

@@ -285,9 +285,10 @@ def natsort(l: list) -> list:
     alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)]
     return sorted(l, key=alphanum_key)
 
-def mem_clean():
+def mem_clean(force: bool = False) -> bool:
     """Clean memory by removing unused objects"""
-    return
+    if not force:
+        return False
     import sys, gc
     ok = False
     try: