pygpt-net 2.6.0.post2__py3-none-any.whl → 2.6.2__py3-none-any.whl

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,11 @@
+2.6.2 (2025-08-15)
+
+- Added plugins (beta): Google, Facebook, X/Twitter, Telegram, Slack, GitHub, Bitbucket.
+
+2.6.1 (2025-08-14)
+
+- LlamaIndex Agents refactored to Workflows.
+
 2.6.0 (2025-08-13)
 
 - Added split responses to the OpenAI Agents in non-streaming mode.

pygpt_net/__init__.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.13 00:00:00                  #
+# Updated Date: 2025.08.15 00:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.6.0"
-__build__ = "2025-08-13"
+__version__ = "2.6.2"
+__build__ = "2025-08-15"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __report__ = "https://github.com/szczyglis-dev/py-gpt/issues"

pygpt_net/app.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.09 01:00:00                  #
+# Updated Date: 2025.08.15 00:00:00                  #
 # ================================================== #
 
 import os
@@ -70,14 +70,23 @@ from pygpt_net.plugin.openai_vision import Plugin as OpenAIVisionPlugin
 from pygpt_net.plugin.real_time import Plugin as RealTimePlugin
 from pygpt_net.plugin.agent import Plugin as AgentPlugin
 from pygpt_net.plugin.mailer import Plugin as MailerPlugin
+from pygpt_net.plugin.google import Plugin as GooglePlugin
+from pygpt_net.plugin.twitter import Plugin as TwitterPlugin
+from pygpt_net.plugin.facebook import Plugin as FacebookPlugin
+from pygpt_net.plugin.telegram import Plugin as TelegramPlugin
+from pygpt_net.plugin.slack import Plugin as SlackPlugin
+from pygpt_net.plugin.github import Plugin as GithubPlugin
+from pygpt_net.plugin.bitbucket import Plugin as BitbucketPlugin
 
 # agents (Llama-index)
-from pygpt_net.provider.agents.llama_index.openai import OpenAIAgent
-from pygpt_net.provider.agents.llama_index.openai_assistant import OpenAIAssistantAgent
-from pygpt_net.provider.agents.llama_index.planner import PlannerAgent
-from pygpt_net.provider.agents.llama_index.react import ReactAgent
+# from pygpt_net.provider.agents.llama_index.legacy.openai import OpenAIAgent
+from pygpt_net.provider.agents.llama_index.legacy.openai_assistant import OpenAIAssistantAgent
+# from pygpt_net.provider.agents.llama_index.legacy.planner import PlannerAgent
+from pygpt_net.provider.agents.llama_index.planner_workflow import PlannerAgent as PlannerWorkflowAgent
+from pygpt_net.provider.agents.llama_index.openai_workflow import OpenAIAgent as OpenAIWorkflowAgent
+# from pygpt_net.provider.agents.llama_index.legacy.react import ReactAgent
 from pygpt_net.provider.agents.llama_index.react_workflow import ReactWorkflowAgent
-from pygpt_net.provider.agents.llama_index.code_act import CodeActAgent
+from pygpt_net.provider.agents.llama_index.codeact_workflow import CodeActAgent
 from pygpt_net.provider.agents.openai.agent import Agent as OpenAIAgentsBase
 from pygpt_net.provider.agents.openai.agent_with_experts import Agent as OpenAIAgentsExperts
 from pygpt_net.provider.agents.openai.agent_with_experts_feedback import Agent as OpenAIAgentsExpertsFeedback
@@ -378,6 +387,13 @@ def run(**kwargs):
     launcher.add_plugin(IdxLlamaIndexPlugin())
     launcher.add_plugin(MailerPlugin())
     launcher.add_plugin(CrontabPlugin())
+    launcher.add_plugin(GooglePlugin())
+    launcher.add_plugin(TwitterPlugin())
+    launcher.add_plugin(FacebookPlugin())
+    launcher.add_plugin(TelegramPlugin())
+    launcher.add_plugin(SlackPlugin())
+    launcher.add_plugin(GithubPlugin())
+    launcher.add_plugin(BitbucketPlugin())
 
     # register custom plugins
     plugins = kwargs.get('plugins', None)
@@ -420,10 +436,12 @@ def run(**kwargs):
             launcher.add_vector_store(store)
 
     # register base agents
-    launcher.add_agent(OpenAIAgent())  # llama-index
+    # launcher.add_agent(OpenAIAgent())  # llama-index
+    launcher.add_agent(OpenAIWorkflowAgent())  # llama-index
     launcher.add_agent(OpenAIAssistantAgent())  # llama-index
-    launcher.add_agent(PlannerAgent())  # llama-index
-    launcher.add_agent(ReactAgent())  # llama-index
+    # launcher.add_agent(PlannerAgent())  # llama-index
+    launcher.add_agent(PlannerWorkflowAgent())  # llama-index
+    # launcher.add_agent(ReactAgent())  # llama-index
     launcher.add_agent(ReactWorkflowAgent())  # llama-index
     launcher.add_agent(CodeActAgent())  # llama-index
     launcher.add_agent(OpenAIAgentsBase())  # openai-agents

pygpt_net/controller/chat/response.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.11 19:00:00                  #
+# Updated Date: 2025.08.14 01:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any
@@ -164,14 +164,16 @@ class Response:
         :param context: BridgeContext
         :param extra: Extra data
         """
+        global_mode = self.window.core.config.get('mode', MODE_AGENT_LLAMA)
         ctx = context.ctx
         if self.window.controller.kernel.stopped():
             output = ctx.output
             if output and has_unclosed_code_tag(output):
                 ctx.output += "\n```"
             ctx.msg_id = None
-            self.window.core.ctx.add(ctx)  # store context to prevent current output from being lost
-            self.window.controller.ctx.prepare_name(ctx)  # summarize if not yet
+            if ctx.id is None:
+                self.window.core.ctx.add(ctx)  # store context to prevent current output from being lost
+                self.window.controller.ctx.prepare_name(ctx)  # summarize if not yet
 
             # finish render
             self.window.dispatch(AppEvent(AppEvent.CTX_END))  # app event
@@ -227,7 +229,8 @@ class Response:
         }
         event = RenderEvent(RenderEvent.INPUT_APPEND, data)
         self.window.dispatch(event)
-        self.window.core.ctx.add(ctx)
+        if ctx.id is None:
+            self.window.core.ctx.add(ctx)
         self.window.controller.ctx.update(
             reload=True,
             all=False,
@@ -266,6 +269,9 @@ class Response:
         self.window.dispatch(event)
 
         # if continue reasoning
+        if global_mode not in [MODE_AGENT_LLAMA, MODE_AGENT_OPENAI]:
+            return  # no agent mode, nothing to do
+
         if ctx.extra is None or (type(ctx.extra) == dict and "agent_finish" not in ctx.extra):
             self.window.update_status(trans("status.agent.reasoning"))
             self.window.controller.chat.common.lock_input()  # lock input, re-enable stop button

pygpt_net/controller/chat/stream.py

@@ -77,6 +77,21 @@ class StreamWorker(QRunnable):
             if generator is not None:
                 for chunk in generator:
                     if ctrl.kernel.stopped():
+                        if hasattr(generator, 'close'):
+                            try:
+                                generator.close()
+                            except Exception:
+                                pass
+                        elif hasattr(generator, 'cancel'):
+                            try:
+                                generator.cancel()
+                            except Exception:
+                                pass
+                        elif hasattr(generator, 'stop'):
+                            try:
+                                generator.stop()
+                            except Exception:
+                                pass
                         ctx.msg_id = None
                         stopped = True
                         break
@@ -239,7 +254,6 @@ class StreamWorker(QRunnable):
                         elif etype == "response.image_generation_call.partial_image":
                             image_base64 = chunk.partial_image_b64
                             image_bytes = base64.b64decode(image_base64)
-                            # prosty i bezpieczny overwrite (jak w oryginale)
                             with open(img_path, "wb") as f:
                                 f.write(image_bytes)
                             is_image = True
@@ -249,7 +263,6 @@ class StreamWorker(QRunnable):
                             ctx.msg_id = str(chunk.response.id)
                             core.ctx.update_item(ctx)
 
-                        # end/error etype – nic nie robimy
                         elif etype in {"response.done", "response.failed", "error"}:
                             pass
 
@@ -407,6 +420,14 @@ class Stream:
     ):
         """
         Asynchronous append of stream worker to the thread.
+
+        :param ctx: Context item
+        :param mode: Mode of operation (e.g., MODE_ASSISTANT)
+        :param is_response: Whether this is a response stream
+        :param reply: Reply identifier
+        :param internal: Whether this is an internal stream
+        :param context: Optional BridgeContext for additional context
+        :param extra: Additional data to pass to the stream
         """
         self.ctx = ctx
         self.mode = mode
@@ -430,6 +451,8 @@ class Stream:
     def handleEnd(self, ctx: CtxItem):
         """
         Slot for handling end of stream
+
+        :param ctx: Context item
         """
         self.window.controller.ui.update_tokens()
 
@@ -457,9 +480,19 @@ class Stream:
         self.worker = None
 
     def handleEvent(self, event):
+        """
+        Slot for handling stream events
+
+        :param event: RenderEvent
+        """
         self.window.dispatch(event)
 
     def handleError(self, error):
+        """
+        Slot for handling stream errors
+
+        :param error: Exception or error message
+        """
         self.window.core.debug.log(error)
         if self.is_response:
             if not isinstance(self.extra, dict):
@@ -475,4 +508,9 @@ class Stream:
             )
 
     def log(self, data: object):
+        """
+        Log data to the debug console
+
+        :param data: object to log
+        """
         self.window.core.debug.info(data)

pygpt_net/controller/model/editor.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.19 17:00:00                  #
+# Updated Date: 2025.08.14 01:00:00                  #
 # ================================================== #
 
 import copy
+import json
 from typing import Optional, Any
 
 from pygpt_net.core.events import Event
@@ -107,7 +108,14 @@ class Editor:
                 "description": "model.llama_index.env.desc",
                 "advanced": True,
             },
+            "extra_json": {
+                "type": "textarea",
+                "label": "model.extra",
+                "description": "model.extra.desc",
+                "advanced": True,
+            },
         }
+        self.custom_fields = ["extra_json"]
 
     def get_options(self):
         """
@@ -220,8 +228,12 @@ class Editor:
             model = self.window.core.models.items[self.current]
             data_dict = model.to_dict()
             for key in options:
-                value = data_dict[key]
-                options[key]["value"] = value
+                if key in data_dict:
+                    value = data_dict[key]
+                    options[key]["value"] = value
+
+            # custom fields
+            options["extra_json"]["value"] = json.dumps(model.extra, indent=4) if model.extra else ""
 
         if self.current is not None and self.current in self.window.core.models.items:
             self.set_tab_by_id(self.current)
@@ -229,15 +241,24 @@ class Editor:
         # load and apply options to config dialog
         self.window.controller.config.load_options("model", options)
 
-    def save(self, persist: bool = True):
+    def save(
+            self,
+            persist: bool = True,
+            force: bool = False
+    ):
         """
         Save models editor
 
         :param persist: persist to file and close dialog
+        :param force: force save without validation
         """
         options = copy.deepcopy(self.get_options())  # copy options
         data_dict = {}
+
+        # base fields
         for key in options:
+            if key in self.custom_fields:
+                continue
             value = self.window.controller.config.get_value(
                 parent_id="model",
                 key=key,
@@ -245,6 +266,26 @@ class Editor:
             )
             data_dict[key] = value
 
+        # custom fields
+        if "extra_json" in options:
+            extra_json = self.window.controller.config.get_value(
+                parent_id="model",
+                key="extra_json",
+                option=options["extra_json"],
+            )
+            try:
+                if extra_json:
+                    decoded = json.loads(extra_json)
+                    data_dict["extra"] = decoded
+                else:
+                    data_dict["extra"] = {}
+            except json.JSONDecodeError as error:
+                self.window.ui.dialogs.alert(
+                    "JSON decoding error in 'extra' field. Please check the syntax:\n\n{}".format(error)
+                )
+                if not force:
+                    return # if JSON is invalid, do not save
+
         # update current model
         if self.current in self.window.core.models.items:
             self.window.core.models.items[self.current].from_dict(data_dict)

pygpt_net/controller/plugins/plugins.py

@@ -458,6 +458,31 @@ class Plugins:
         self.settings.setup()
         self.update()
 
+    def save_all(self):
+        """Save plugin settings"""
+        for id in self.window.core.plugins.plugins.keys():
+            plugin = self.window.core.plugins.plugins[id]
+            options = plugin.setup()  # get plugin options
+
+            # add plugin to global config data if not exists
+            if id not in self.window.core.config.get('plugins'):
+                self.window.core.config.data['plugins'][id] = {}
+
+            # update config with current values
+            for key in options:
+                self.window.core.config.data['plugins'][id][key] = self.window.core.plugins.plugins[id].options[key]['value']
+
+            # remove key from config if plugin option not exists
+            for key in list(self.window.core.config.data['plugins'].keys()):
+                if key not in self.window.core.plugins.plugins:
+                    self.window.core.config.data['plugins'].pop(key)
+
+        # save preset
+        self.window.controller.plugins.presets.save_current()
+
+        # save config
+        self.window.core.config.save()
+
     def log(self, data: Any):
         """
         Log data to debug