pygpt-net 2.1.37__py3-none-any.whl → 2.4.48__py3-none-any.whl

pygpt_net/plugin/crontab/config.py

@@ -0,0 +1,73 @@
+#!/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: 2024.11.18 19:00:00                  #
+# ================================================== #
+
+from pygpt_net.plugin.base.config import BaseConfig, BasePlugin
+
+
+class Config(BaseConfig):
+    def __init__(self, plugin: BasePlugin = None, *args, **kwargs):
+        super(Config, self).__init__(plugin)
+        self.plugin = plugin
+
+    def from_defaults(self, plugin: BasePlugin = None):
+        """
+        Set default options for plugin
+
+        :param plugin: plugin instance
+        """
+        keys = {
+            "enabled": "bool",
+            "crontab": "text",
+            "prompt": "textarea",
+            "preset": {
+                "type": "combo",
+                "use": "presets",
+                "keys": [],
+            },
+        }
+        items = [
+            {
+                "enabled": False,
+                "crontab": "30 9 * * *",
+                "prompt": "Hi! This prompt should be sent at 9:30 every day. What time is it?",
+                "preset": "_",
+            },
+        ]
+        desc = "Add your cron-style tasks here. They will be executed automatically at the times you specify in " \
+               "the cron-based job format. If you are unfamiliar with Cron, consider visiting the Cron Guru " \
+               "page for assistance."
+        tooltip = "Check out the tutorials about Cron or visit the Crontab Guru for help on how to use Cron syntax."
+        plugin.add_option(
+            "crontab",
+            type="dict",
+            value=items,
+            label="Your tasks",
+            description=desc,
+            tooltip=tooltip,
+            keys=keys,
+            urls={
+                "Crontab Guru": "https://crontab.guru",
+            },
+        )
+        plugin.add_option(
+            "new_ctx",
+            type="bool",
+            value=True,
+            label="Create a new context on job run",
+            description="If enabled, then a new context will be created on every run of the job",
+        )
+        plugin.add_option(
+            "show_notify",
+            type="bool",
+            value=True,
+            label="Show notification on job run",
+            description="If enabled, then a tray notification will be shown on every run of the job",
+        )

pygpt_net/plugin/experts/__init__.py

@@ -0,0 +1,81 @@
+#!/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: 2024.11.21 20:00:00                  #
+# ================================================== #
+
+from pygpt_net.core.types import (
+    MODE_AGENT,
+    MODE_EXPERT,
+)
+from pygpt_net.plugin.base.plugin import BasePlugin
+from pygpt_net.core.events import Event
+
+from .config import Config
+
+class Plugin(BasePlugin):
+    def __init__(self, *args, **kwargs):
+        super(Plugin, self).__init__(*args, **kwargs)
+        self.id = "experts"
+        self.name = "Experts (inline)"
+        self.description = "Enables inline experts in current mode."
+        self.prefix = "Experts"
+        self.type = [
+            "expert",
+        ]
+        self.allowed_cmds = [
+            "expert_call",
+        ]
+        self.order = 9998
+        self.use_locale = True
+        self.disallowed_modes = [MODE_AGENT, MODE_EXPERT]
+        self.config = Config(self)
+        self.init_options()
+
+    def init_options(self):
+        """
+        Initialize options
+        """
+        self.config.from_defaults(self)
+
+    def is_allowed(self) -> bool:
+        """
+        Check if plugin is allowed to run
+
+        :return: True if plugin is allowed to run
+        """
+        return self.window.core.config.get("mode") not in self.disallowed_modes
+
+    def handle(self, event: Event, *args, **kwargs):
+        """
+        Handle dispatched event
+
+        :param event: event object
+        :param args: event args
+        :param kwargs: event kwargs
+        """
+        if not self.is_allowed():
+            return
+
+        name = event.name
+        data = event.data
+        if name == Event.SYSTEM_PROMPT:
+            if "is_expert" in data and data["is_expert"]:
+                return  # disable if called inside expert
+            data['value'] = self.on_system_prompt(data['value'])
+
+    def on_system_prompt(self, prompt: str) -> str:
+        """
+        Event: SYSTEM_PROMPT
+
+        :param prompt: prompt
+        :return: updated prompt
+        """
+        if prompt is not None and prompt.strip() != "":
+            prompt+= "\n\n"
+        return prompt + self.window.core.experts.get_prompt()

pygpt_net/plugin/experts/config.py

@@ -0,0 +1,26 @@
+#!/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: 2024.11.18 19:00:00                  #
+# ================================================== #
+
+from pygpt_net.plugin.base.config import BaseConfig, BasePlugin
+
+
+class Config(BaseConfig):
+    def __init__(self, plugin: BasePlugin = None, *args, **kwargs):
+        super(Config, self).__init__(plugin)
+        self.plugin = plugin
+
+    def from_defaults(self, plugin: BasePlugin = None):
+        """
+        Set default options for plugin
+
+        :param plugin: plugin instance
+        """
+        pass

pygpt_net/plugin/extra_prompt/__init__.py

@@ -6,65 +6,33 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.30 13:00:00                  #
+# Updated Date: 2024.11.20 03:00:00                  #
 # ================================================== #
 
-from pygpt_net.plugin.base import BasePlugin
-from pygpt_net.core.dispatcher import Event
+from pygpt_net.plugin.base.plugin import BasePlugin
+from pygpt_net.core.events import Event
+
+from .config import Config
 
 
 class Plugin(BasePlugin):
     def __init__(self, *args, **kwargs):
         super(Plugin, self).__init__(*args, **kwargs)
         self.id = "extra_prompt"
-        self.name = "System Prompt Extra (append)"
+        self.name = "System Prompt Extra"
         self.description = "Appends extra system prompt from list to every system prompt."
+        self.prefix = "Prompt"
         self.iteration = 0
         self.prev_output = None
         self.order = 9998
         self.use_locale = True
         self.stop = False
+        self.config = Config(self)
         self.init_options()
 
     def init_options(self):
-        """
-        Initialize options
-        """
-        # extra prompts
-        keys = {
-            "enabled": "bool",
-            "name": "text",
-            "prompt": "textarea",
-        }
-        items = []
-        desc = "Prompt that will be appended to every system prompt. " \
-               "All active prompts will be appended to the system prompt in the order they are listed here."
-        tooltip = desc
-        self.add_option(
-            "prompts",
-            type="dict",
-            value=items,
-            label="Prompts",
-            description=desc,
-            tooltip=tooltip,
-            keys=keys,
-        )
-
-    def setup(self) -> dict:
-        """
-        Return available config options
-
-        :return: config options
-        """
-        return self.options
-
-    def attach(self, window):
-        """
-        Attach window
-
-        :param window: Window instance
-        """
-        self.window = window
+        """Initialize options"""
+        self.config.from_defaults(self)
 
     def handle(self, event: Event, *args, **kwargs):
         """

pygpt_net/plugin/extra_prompt/config.py

@@ -0,0 +1,44 @@
+#!/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: 2024.11.18 19:00:00                  #
+# ================================================== #
+
+from pygpt_net.plugin.base.config import BaseConfig, BasePlugin
+
+
+class Config(BaseConfig):
+    def __init__(self, plugin: BasePlugin = None, *args, **kwargs):
+        super(Config, self).__init__(plugin)
+        self.plugin = plugin
+
+    def from_defaults(self, plugin: BasePlugin = None):
+        """
+        Set default options for plugin
+
+        :param plugin: plugin instance
+        """
+        # extra prompts
+        keys = {
+            "enabled": "bool",
+            "name": "text",
+            "prompt": "textarea",
+        }
+        items = []
+        desc = "Prompt that will be appended to every system prompt. " \
+               "All active prompts will be appended to the system prompt in the order they are listed here."
+        tooltip = desc
+        plugin.add_option(
+            "prompts",
+            type="dict",
+            value=items,
+            label="Prompts",
+            description=desc,
+            tooltip=tooltip,
+            keys=keys,
+        )

pygpt_net/plugin/idx_llama_index/__init__.py

@@ -6,162 +6,48 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.13 15:00:00                  #
+# Updated Date: 2024.11.29 23:00:00                  #
 # ================================================== #
 
 import json
 
-from pygpt_net.plugin.base import BasePlugin
-from pygpt_net.core.dispatcher import Event
+from pygpt_net.core.types import (
+    MODE_LLAMA_INDEX,
+)
+from pygpt_net.plugin.base.plugin import BasePlugin
+from pygpt_net.core.events import Event, KernelEvent
 from pygpt_net.item.ctx import CtxItem
+from pygpt_net.core.bridge.context import BridgeContext
 
+from .config import Config
 from .worker import Worker
 
-
 class Plugin(BasePlugin):
     def __init__(self, *args, **kwargs):
         super(Plugin, self).__init__(*args, **kwargs)
         self.id = "idx_llama_index"
         self.name = "Llama-index (inline)"
         self.description = "Integrates Llama-index storage in any chat"
+        self.prefix = "Idx"
         self.allowed_cmds = [
             "get_context",
         ]
         self.ignored_modes = [
-            "llama_index",
+            MODE_LLAMA_INDEX,
+        ]
+        self.type = [
+            "cmd.inline",
         ]
         self.order = 100
         self.use_locale = True
+        self.worker = None
         self.mode = None  # current mode
+        self.config = Config(self)
         self.init_options()
 
     def init_options(self):
         """Initialize options"""
-        prompt = 'ADDITIONAL CONTEXT: I will provide you with additional context about my question. ' \
-                 'When it is provided, then use this data as additional context and use it in your response. ' \
-                 'Additional context will be prefixed with an "ADDITIONAL CONTEXT:" prefix. You can also provide a ' \
-                 'command to query my context database anytime you need any additional context - to do this, return ' \
-                 'to me the prepared prompt in JSON format, all in one line, using the following syntax: ' \
-                 '~###~{"cmd": "get_context", "params": {"query": "<simple question here>"}}~###~. ' \
-                 'Use ONLY this syntax and remember to surround the JSON string with ~###~. DO NOT use any other ' \
-                 'syntax. When making query use language that I spoke to you.'
-
-        self.add_option(
-            "prompt",
-            type="textarea",
-            value=prompt,
-            label="Prompt",
-            description="Prompt used for instruct how to use additional data provided from Llama-index",
-            tooltip="Prompt",
-            advanced=True,
-        )
-        self.add_option(
-            "idx",
-            type="text",
-            value="base",
-            label="Indexes to use",
-            description="ID's of indexes to use, default: base, separate by comma if you want to use "
-                        "more than one index at once",
-            tooltip="Index name",
-        )
-        self.add_option(
-            "ask_llama_first",
-            type="bool",
-            value=False,
-            label="Ask Llama-index first",
-            description="When enabled, then Llama-index will be asked first, and response will be used "
-                        "as additional knowledge in prompt. When disabled, then Llama-index will be "
-                        "asked only when needed.",
-        )
-        self.add_option(
-            "prepare_question",
-            type="bool",
-            value=False,
-            label="Auto-prepare question before asking Llama-index first",
-            description="When enabled, then question will be prepared before asking Llama-index first to create"
-                        "best question for Llama-index.",
-        )
-        self.add_option(
-            "model_prepare_question",
-            type="combo",
-            use="models",
-            value="gpt-3.5-turbo",
-            label="Model for question preparation",
-            description="Model used to prepare question before asking Llama-index, default: gpt-3.5-turbo",
-            tooltip="Model",
-        )
-        self.add_option(
-            "prepare_question_max_tokens",
-            type="int",
-            value=500,
-            label="Max output tokens for question preparation",
-            description="Max tokens in output when preparing question before asking Llama-index",
-            min=1,
-            max=None,
-        )
-        self.add_option(
-            "model_query",
-            type="combo",
-            value="gpt-3.5-turbo",
-            label="Model",
-            description="Model used for querying Llama-index, default: gpt-3.5-turbo",
-            tooltip="Query model",
-            use="models",
-        )
-        self.add_option(
-            "max_question_chars",
-            type="int",
-            value=1000,
-            label="Max characters in question",
-            description="Max characters in question when querying Llama-index, 0 = no limit",
-            min=0,
-            max=None,
-        )
-        self.add_option(
-            "append_meta",
-            type="bool",
-            value=False,
-            label="Append metadata to context",
-            description="If enabled, then metadata from Llama-index will be appended to additional context",
-        )
-        self.add_option(
-            "syntax_prepare_question",
-            type="textarea",
-            value='Simplify the question into a short query for retrieving information from a vector store.',
-            label="Prompt for question preparation",
-            description="System prompt for question preparation",
-            advanced=True,
-        )
-        self.add_cmd(
-            "get_context",
-            instruction="get additional context for a given question",
-            params=[
-                {
-                    "name": "query",
-                    "type": "str",
-                    "description": "question to retrieve additional context for",
-                    "required": True,
-                },
-            ],
-            enabled=True,
-            description="If enabled, model will be able to get additional context for a given question",
-        )
-
-    def setup(self) -> dict:
-        """
-        Return available config options
-
-        :return: config options
-        """
-        return self.options
-
-    def attach(self, window):
-        """
-        Attach window
-
-        :param window: Window instance
-        """
-        self.window = window
+        self.config.from_defaults(self)
 
     def handle(self, event: Event, *args, **kwargs):
         """
@@ -179,13 +65,13 @@ class Plugin(BasePlugin):
         if name == Event.SYSTEM_PROMPT:
             if self.mode in self.ignored_modes:  # ignore
                 return
-            data['value'] = self.on_system_prompt(data['value'])
+            # data['value'] = self.on_system_prompt(data['value'])
 
         elif name == Event.INPUT_BEFORE:  # get only mode
             if "mode" in data:
                 self.mode = data['mode']
 
-        elif name == Event.POST_PROMPT:
+        elif name == Event.POST_PROMPT_END:
             if self.mode in self.ignored_modes:  # ignore
                 return
 
@@ -198,7 +84,13 @@ class Plugin(BasePlugin):
                 ctx,
             )
 
-        elif name == Event.CMD_SYNTAX:
+        elif name in [
+            Event.CMD_SYNTAX,
+            Event.CMD_SYNTAX_INLINE,
+        ]:
+            if self.mode in self.ignored_modes:  # ignore
+                return
+
             self.cmd_syntax(data)
 
         elif name in [
@@ -254,16 +146,43 @@ class Plugin(BasePlugin):
         if self.window.core.models.has(tmp_model):
             model = self.window.core.models.get(tmp_model)
 
-        response = self.window.core.bridge.quick_call(
-            prompt=ctx.input,
+        tmp_ctx = CtxItem()  # use copy of original context
+        tmp_ctx.from_dict(ctx.to_dict())
+
+        bridge_context = BridgeContext(
+            ctx=tmp_ctx,
+            prompt=tmp_ctx.input,
             system_prompt=sys_prompt,
-            max_tokens=self.get_option_value("prepare_question_max_tokens"),
             model=model,
+            max_tokens=self.get_option_value("prepare_question_max_tokens"),
+            temperature=0.0,
         )
+        event = KernelEvent(KernelEvent.CALL, {
+            'context': bridge_context,
+            'extra': {},
+        })
+        self.window.dispatch(event)
+        response = event.data.get('response')
         if response is not None and response != "":
             prepared_question = response
         return prepared_question
 
+    def get_from_retrieval(self, query: str) -> str:
+        """
+        Get response from retrieval
+
+        :param query: query
+        :return: response
+        """
+        idx = self.get_option_value("idx")
+        indexes = idx.split(",")
+        response = ""
+        for index in indexes:
+            response = self.window.core.idx.chat.query_retrieval(query, index)
+            if response is not None and response != "":
+                break
+        print(response)
+        return response
 
     def on_post_prompt(self, prompt: str, ctx: CtxItem) -> str:
         """
@@ -273,7 +192,8 @@ class Plugin(BasePlugin):
         :param ctx: CtxItem
         :return: updated system prompt
         """
-        if not self.get_option_value("ask_llama_first") or self.window.controller.agent.enabled():
+        if (not self.get_option_value("ask_llama_first")
+                or self.window.controller.agent.legacy.enabled()):
             return prompt
 
         question = ctx.input
@@ -284,6 +204,12 @@ class Plugin(BasePlugin):
 
         self.log("Querying Llama-index for: " + question)
 
+        # at first, try to get from retrieval
+        response = self.get_from_retrieval(question)
+        if response is not None and response != "":
+            self.log("Found using retrieval...")
+            return prompt + "\nADDITIONAL CONTEXT: " + response
+
         response, doc_ids, metas = self.query(question)
         if response is None or len(response) == 0:
             self.log("No additional context. Aborting.")
@@ -305,6 +231,7 @@ class Plugin(BasePlugin):
         metas = []
         idx = self.get_option_value("idx")
         model = self.window.core.models.from_defaults()
+
         if self.get_option_value("model_query") is not None:
             model_query = self.get_option_value("model_query")
             if self.window.core.models.has(model_query):
@@ -319,41 +246,50 @@ class Plugin(BasePlugin):
             if len(question) > max_len:
                 question = question[:max_len]
 
-        # query index(es)
+        # query multiple indexes
         if len(indexes) > 1:
             responses = []
             for index in indexes:
                 ctx = CtxItem()  # tmp ctx
                 ctx.input = question
-                self.window.core.idx.chat.query(
+                bridge_context = BridgeContext(
                     ctx=ctx,
                     idx=index.strip(),
                     model=model,
                     stream=False,
                 )
+                self.window.core.idx.chat.query(
+                    context=bridge_context,
+                )
                 if ctx.index_meta:
                     doc_ids.append(ctx.index_meta)
                     metas.append(ctx.index_meta)
                     self.append_meta_to_response(ctx)
-                self.log("Using additional context: " + str(ctx.output))
+
+                self.log("Using additional context")
                 responses.append(ctx.output)
 
             return "\n---\n".join(responses), doc_ids, metas
+
+        # query single index
         else:
             ctx = CtxItem()  # tmp ctx
             ctx.input = question
-            self.window.core.idx.chat.query(
+            bridge_context = BridgeContext(
                 ctx=ctx,
                 idx=idx,
                 model=model,
                 stream=False,
             )
+            self.window.core.idx.chat.query(
+                context=bridge_context,
+            )
             if ctx.index_meta:
                 doc_ids.append(ctx.index_meta)
                 metas.append(ctx.index_meta)
                 self.append_meta_to_response(ctx)
-            self.log("Using additional context: " + str(ctx.output))
 
+            self.log("Using additional context")
             return ctx.output, doc_ids, metas  # tmp ctx, llama doc_ids, meta
 
     def append_meta_to_response(self, ctx: CtxItem):
@@ -385,27 +321,18 @@ class Plugin(BasePlugin):
         if not is_cmd:
             return
 
+        # set state: busy
+        self.cmd_prepare(ctx, my_commands)
+
         try:
-            # worker
             worker = Worker()
-            worker.plugin = self
+            worker.from_defaults(self)
             worker.cmds = my_commands
             worker.ctx = ctx
-
-            # signals (base handlers)
-            worker.signals.finished.connect(self.handle_finished)
-            worker.signals.log.connect(self.handle_log)
-            worker.signals.debug.connect(self.handle_debug)
-            worker.signals.status.connect(self.handle_status)
-            worker.signals.error.connect(self.handle_error)
-
-            # check if async allowed
-            if not self.window.core.dispatcher.async_allowed(ctx):
+            if not self.is_async(ctx):
                 worker.run()
                 return
-
-            # start
-            self.window.threadpool.start(worker)
+            worker.run_async()
 
         except Exception as e:
             self.error(e)
@@ -416,8 +343,7 @@ class Plugin(BasePlugin):
 
         :param msg: message to log
         """
-        full_msg = '[LLAMA-INDEX] ' + str(msg)
-        self.debug(full_msg)
-        self.window.ui.status(full_msg.replace("\n", " "))
-        if self.is_log():
-            print(full_msg)
+        if self.is_threaded():
+            return
+        super(Plugin, self).log(msg)
+        self.window.idx_logger_message.emit(msg)