pygpt-net 2.4.36.post1__py3-none-any.whl → 2.4.38__py3-none-any.whl

pygpt_net/core/render/web/body.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 04:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 import os
@@ -46,21 +46,35 @@ class Body:
 
         :return: CSS styles
         """
-        dark_styles = ["dracula", "fruity", "github-dark", "gruvbox-dark", "inkpot", "material", "monokai",
-                       "native", "nord", "nord-darker", "one-dark", "paraiso-dark", "rrt", "solarized-dark",
-                       "stata-dark", "vim", "zenburn"]
-        style = self.window.core.config.get("render.code_syntax")
-        if style is None or style == "":
-            style = "default"
+        syntax_dark = [
+            "dracula",
+            "fruity",
+            "github-dark",
+            "gruvbox-dark",
+            "inkpot",
+            "material",
+            "monokai",
+            "native",
+            "nord",
+            "nord-darker",
+            "one-dark",
+            "paraiso-dark",
+            "rrt",
+            "solarized-dark",
+            "stata-dark",
+            "vim",
+            "zenburn",
+        ]
+        syntax_style = self.window.core.config.get("render.code_syntax")
+        if syntax_style is None or syntax_style == "":
+            syntax_style = "default"
         fonts_path = os.path.join(self.window.core.config.get_app_path(), "data", "fonts").replace("\\", "/")
         stylesheet = self.window.controller.theme.markdown.get_web_css().replace('%fonts%', fonts_path)
-        if style in dark_styles:
+        if syntax_style in syntax_dark:
             stylesheet += "pre { color: #fff; }"
         else:
             stylesheet += "pre { color: #000; }"
-        content = stylesheet + """
-        """ + self.highlight.get_style_defs()
-        return content
+        return stylesheet + " " + self.highlight.get_style_defs()
 
     def prepare_action_icons(self, ctx: CtxItem) -> str:
         """
@@ -187,9 +201,9 @@ class Body:
         """
         icon_path = os.path.join(
             self.window.core.config.get_app_path(),
-            "data", "icons", "public_filled.svg"
+            "data", "icons", "language.svg"
         )
-        icon = '<img src="file://{}" width="25" height="25" valign="middle" class="extra-src-icon">'.format(icon_path)
+        icon = '<img src="file://{}" class="extra-src-icon">'.format(icon_path)
         num_str = ""
         if num is not None and num_all is not None and num_all > 1:
             num_str = " [{}]".format(num)
@@ -235,7 +249,7 @@ class Body:
             self.window.core.config.get_app_path(),
             "data", "icons", "db.svg"
         )
-        icon = '<img src="file://{}" width="25" height="25" valign="middle" class="extra-src-icon">'.format(icon_path)
+        icon = '<img src="file://{}" class="extra-src-icon">'.format(icon_path)
         if html_sources != "":
             html += "<p>{icon}<small><b>{prefix}:</b></small></p>".format(
                 prefix=trans('chat.prefix.doc'),
@@ -259,7 +273,7 @@ class Body:
             self.window.core.config.get_app_path(),
             "data", "icons", "attachments.svg"
         )
-        icon = '<img src="file://{}" width="25" height="25" valign="middle" class="extra-src-icon">'.format(icon_path)
+        icon = '<img src="file://{}" class="extra-src-icon">'.format(icon_path)
         num_str = ""
         if num is not None and num_all is not None and num_all > 1:
             num_str = " [{}]".format(num)
@@ -319,12 +333,14 @@ class Body:
         """
         classes = []
         classes_str = ""
+        style = self.window.core.config.get("theme.style", "blocks")
         if self.window.core.config.get('render.blocks'):
             classes.append("display-blocks")
         if self.window.core.config.get('ctx.edit_icons'):
             classes.append("display-edit-icons")
         if self.is_timestamp_enabled():
             classes.append("display-timestamp")
+        classes.append("theme-" + style)
         if classes:
             classes_str = ' class="' + " ".join(classes) + '"'
 

pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.4.36",
-    "app.version": "2.4.36",
-    "updated_at": "2024-11-28T00:00:00"
+    "version": "2.4.38",
+    "app.version": "2.4.38",
+    "updated_at": "2024-12-08T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],
@@ -65,15 +65,20 @@
   "assistant": "",
   "assistant_thread": "",
   "assistant.store.hide_threads": true,
-  "attachments_auto_index": false,
+  "attachments_auto_index": true,
   "attachments_send_clear": true,
   "attachments_capture_clear": true,
+  "audio.input.channels": 1,
+  "audio.input.device": "0",
+  "audio.input.rate": 44100,
   "audio.transcribe.convert_video": true,
   "context_threshold": 200,
   "cmd": false,
   "ctx": "",
   "ctx.attachment.img": false,
-  "ctx.attachment.mode": "full",
+  "ctx.attachment.mode": "query",
+  "ctx.attachment.rag.history": true,
+  "ctx.attachment.rag.history.max_items": 3,
   "ctx.attachment.summary.model": "gpt-4o-mini",
   "ctx.attachment.query.model": "gpt-4o-mini",
   "ctx.attachment.verbose": false,
@@ -333,6 +338,7 @@
   "temperature": 1.0,
   "theme": "dark_cyan",
   "theme.markdown": true,
+  "theme.style": "chatgpt",
   "top_p": 1.0,
   "upload.store": true,
   "upload.data_dir": false,

pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.36",
-        "app.version": "2.4.36",
-        "updated_at": "2024-11-28T00:00:00"
+        "version": "2.4.38",
+        "app.version": "2.4.38",
+        "updated_at": "2024-12-08T00:00:00"
     },
     "items": {
         "claude-3-5-sonnet-20240620": {

pygpt_net/data/config/modes.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.36",
-        "app.version": "2.4.36",
-        "updated_at": "2024-11-28T00:00:00"
+        "version": "2.4.38",
+        "app.version": "2.4.38",
+        "updated_at": "2024-12-08T00:00:00"
     },
     "items": {
         "chat": {

pygpt_net/data/config/settings.json

@@ -146,6 +146,15 @@
         "step": 1,
         "advanced": false
     },
+    "theme.style": {
+        "section": "layout",
+        "type": "combo",
+        "use": "styles",
+        "label": "settings.theme.style",
+        "description": "settings.render.web.only.desc",
+        "value": "chatgpt",
+        "advanced": false
+    },
     "render.code_syntax": {
         "section": "layout",
         "type": "combo",
@@ -372,6 +381,32 @@
         "step": null,
         "advanced": false
     },
+    "ctx.attachment.rag.history": {
+        "section": "files",
+        "type": "bool",
+        "slider": false,
+        "label": "settings.ctx.attachment.rag.history",
+        "description": "settings.ctx.attachment.rag.history.desc",
+        "value": true,
+        "min": null,
+        "max": null,
+        "multiplier": null,
+        "step": null,
+        "advanced": false
+    },
+    "ctx.attachment.rag.history.max_items": {
+        "section": "files",
+        "type": "int",
+        "slider": true,
+        "label": "settings.ctx.attachment.rag.history.max_items",
+        "description": "settings.ctx.attachment.rag.history.max_items.desc",
+        "value": 5,
+        "min": 0,
+        "max": 100,
+        "multiplier": 1,
+        "step": 1,
+        "advanced": false
+    },
     "download.dir": {
         "section": "files",
         "type": "text",
@@ -911,6 +946,19 @@
         "step": null,
         "advanced": true
     },
+    "vision.capture.idx": {
+        "section": "vision",
+        "type": "int",
+        "slider": true,
+        "label": "settings.vision.capture.idx",
+        "description": "settings.vision.capture.idx.desc",
+        "value": 0,
+        "min": 0,
+        "max": 3,
+        "multiplier": 1,
+        "step": 1,
+        "advanced": false
+    },
     "vision.capture.width": {
         "section": "vision",
         "type": "int",
@@ -935,26 +983,49 @@
         "step": 1,
         "advanced": false
     },
-    "vision.capture.idx": {
+    "vision.capture.quality": {
         "section": "vision",
         "type": "int",
         "slider": true,
-        "label": "settings.vision.capture.idx",
-        "value": 0,
-        "min": 0,
-        "max": 3,
+        "label": "settings.vision.capture.quality",
+        "value": 85,
+        "min": 1,
+        "max": 100,
         "multiplier": 1,
         "step": 1,
         "advanced": false
     },
-    "vision.capture.quality": {
-        "section": "vision",
+    "audio.input.device": {
+        "section": "audio",
+        "type": "combo",
+        "use": "audio_input_devices",
+        "label": "settings.audio.input.device",
+        "description": "settings.audio.input.device.desc",
+        "value": 0,
+        "advanced": false
+    },
+    "audio.input.channels": {
+        "section": "audio",
         "type": "int",
         "slider": true,
-        "label": "settings.vision.capture.quality",
-        "value": 85,
+        "label": "settings.audio.input.channels",
+        "description": "settings.audio.input.channels.desc",
+        "value": 1,
         "min": 1,
-        "max": 100,
+        "max": 4,
+        "multiplier": 1,
+        "step": 1,
+        "advanced": false
+    },
+    "audio.input.rate": {
+        "section": "audio",
+        "type": "int",
+        "slider": true,
+        "label": "settings.audio.input.rate",
+        "description": "settings.audio.input.rate.desc",
+        "value": 44100,
+        "min": 8,
+        "max": 256000,
         "multiplier": 1,
         "step": 1,
         "advanced": false

pygpt_net/data/config/settings_section.json

@@ -23,6 +23,9 @@
     "vision": {
         "label": "settings.section.vision"
     },
+    "audio": {
+        "label": "settings.section.audio"
+    },
     "llama-index": {
         "label": "settings.section.llama_index"
     },

pygpt_net/data/css/style.light.css

@@ -4,6 +4,7 @@
 QWidget {{
   background-color: #e7e7e7;
   color: #000;
+  margin: 1px;
 }}
 
 QListView, 

pygpt_net/data/css/{web.css → web-blocks.css}

@@ -26,6 +26,11 @@ body {{
     -webkit-border-radius: 1ex;
     -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
 }}
+.ts {{
+    display: none;
+}}
+
+/* base */
 a {{
     text-decoration: none;
     color: #a1b5c4 !important;
@@ -38,129 +43,20 @@ p {{
     margin-top: 5px;
     margin-bottom: 5px;
 }}
-.extra-src-icon {{
-    padding-right: 2px;
-}}
-.extra-src-img-box {{
-    display: inline-block;
-    text-align: center;
-    padding: 5px;
-    margin: 5px;
-    max-width: 400px;
-    height: auto;
-    white-space: pre-wrap;
-    word-break: break-all !important;
-}}
-.extra-src-img-box:hover {{
-    cursor: pointer;
-}}
-.extra-src-img-box .title {{
-    width: 400px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    display: block;
-    text-align: center;
-    padding: 0;
-    margin: 0;
-    padding-top: 10px;
-    display: block;
-    font-size: 0.95rem;
-}}
-.extra-src-img-box .img-outer {{
-    display: flex;
-    flex-direction: column;
-}}
-.extra-src-img-box .img-wrapper {{
-    position: relative;
-    overflow: hidden;
-    border: 1px solid #000;
-    background: #000;
-    width: 400px;
-    height: 280px;
-    margin: 0;
-    margin-bottom: 0px !important;
-    border-radius: 5px;
-    -webkit-box-shadow: 8px 8px 22px -16px rgba(0, 0, 0, 1);
-    -moz-box-shadow: 8px 8px 22px -16px rgba(0, 0, 0, 1);
-    box-shadow: 8px 8px 22px -16px rgba(0, 0, 0, 1);
-}}
-.extra-src-img-box .img-wrapper:hover {{
-    border: 1px solid gray;
-}}
-.extra-src-img-box img {{
-    margin-bottom: 2px;
-    padding-bottom: 0px;
-    display: block;
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-}}
-.msg-user {{
-    white-space: pre-wrap;
-    width: auto;
-    max-width: 100%;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 10px;
-    margin-top: 10px;
-    margin-left: 0px;
-    margin-bottom: 5px;
-}}
-.msg-bot {{
-    white-space: pre-wrap;
-    width: auto;
-    max-width: 100%;
-    margin-top: 10px;
-    margin-bottom: 0px;
-    padding-bottom: 0px;
-}}
-.msg-extra {{
-    margin-top: 10px;
-    margin-bottom: 0px;
-    color: gray;
-}}
-.msg-extra a {{
-    color: gray;
-}}
-.msg-user .msg-extra {{
-    font-weight: bold;
-    padding-top: 5px;
-}}
-.msg-box {{
-    padding: 5px;
-    max-width: 100%;
-}}
-.msg-box .msg {{
-    margin: 0;
-    padding: 15px;
-}}
-.msg-box:first-child {{
-    margin-top: 0px;
-}}
-.msg-box:last-child {{
-    border-bottom: none;
-}}
-.msg-box .name-header {{
-    display: none;
-}}
+
+/* images */
 .image {{
     max-width: 400px;
 }}
+
+/* cmd */
 .cmd {{
     font-family: 'Lato';
     text-decoration: none;
     padding-bottom: 0px;
 }}
-.ts {{
-    display: none;
-}}
-.tool-output-header {{
-    margin-top: 15px;
-    margin-bottom: 10px;
-    font-weight: bold;
-    color: gray;
-}}
+
+/* lists, code */
 ul, ol, .list {{
     margin-top: 0px;
     margin-bottom: 0px;
@@ -192,6 +88,7 @@ code {{
 }}
 .code-header-lang {{
     float: left;
+    padding-left: .25rem;
 }}
 .code-header-copy {{
     text-align: right;
@@ -199,6 +96,7 @@ code {{
     font-weight: bold;
     display: inline-block;
     color: #6e6e6e;
+    padding-right: .25rem;
 }}
 .code-header-copy img {{
     vertical-align: middle;
@@ -217,43 +115,65 @@ code {{
 .highlight span {{
     font-family: 'Monaspace Neon';
 }}
+
+/* action icons */
 .action-icons {{
-    margin-top: 10px;
+    margin-top: 20px;
 }}
 .action-icons a {{
     text-decoration: none;
 }}
 .action-icons a:hover {{
-    filter: brightness(60%);
+    filter: brightness(120%);
 }}
 .action-img {{
     width: 20px;
     height: 20px;
 }}
 .edit-icon {{
-    display: none;
-}}
-.display-edit-icons .edit-icon {{
     display: inline;
 }}
-.display-timestamp .ts {{
+.theme-blocks.display-timestamp .ts {{
     display: inline;
 }}
-.display-blocks {{
-}}
-.display-blocks .msg-box {{
+
+/* message box */
+.msg-box {{
+    max-width: 100%;
     border-radius: 10px;
     padding: 10px;
     margin-right: 10px;
 }}
-.display-blocks .msg-box:not(first-child) {{
+.msg-user {{
+    white-space: pre-wrap;
+    width: auto;
+    max-width: 100%;
+    padding-top: 10px;
+    padding-bottom: 5px;
+    padding-left: 10px;
+    margin-top: 10px;
+    margin-left: 0px;
+    margin-bottom: 5px;
+}}
+.msg-bot {{
+    white-space: pre-wrap;
+    width: auto;
+    max-width: 100%;
+    margin-top: 10px;
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+}}
+.msg-box:not(first-child) {{
     margin-top: 20px !important;
 }}
-.display-blocks .name-header {{
+.msg-box:first-child {{
+    margin-top: 0px;
+}}
+.msg-box .name-header {{
     display: block;
     font-size: 0.8rem;
 }}
-.display-blocks .name-header::before {{
+.msg-box .name-header::before {{
     content: '';
     display: inline-block;
     width: 10px;
@@ -262,15 +182,29 @@ code {{
     margin-right: 8px;
     vertical-align: middle;
 }}
-.append_input {{
-    margin: 0;
-    padding: 0;
+.msg-extra {{
+    margin-top: 10px;
+    margin-bottom: 0px;
+    color: gray;
 }}
-.append_output {{
+.msg-extra a {{
+    color: gray;
+}}
+.msg-user .msg-extra {{
+    font-weight: bold;
+    padding-top: 5px;
+}}
+.msg-box .msg {{
     margin: 0;
-    padding: 0;
+    padding: 15px;
 }}
-.empty_list {{
+
+/* tool output */
+.tool-output-header {{
+    margin-top: 15px;
+    margin-bottom: 10px;
+    font-weight: bold;
+    color: gray;
 }}
 .tool-output .content {{
     padding: 10px;
@@ -282,9 +216,84 @@ code {{
     display: block;
     color: gray;
 }}
+
+/* extra source */
+.extra-src-icon {{
+    padding-right: 2px;
+    width: 25px;
+    height: 25px;
+    vertical-align: middle;
+}}
+.extra-src-img-box {{
+    display: inline-block;
+    text-align: center;
+    padding: 5px;
+    margin: 5px;
+    max-width: 400px;
+    height: auto;
+    white-space: pre-wrap;
+    word-break: break-all !important;
+}}
+.extra-src-img-box:hover {{
+    cursor: pointer;
+}}
+.extra-src-img-box .title {{
+    width: 400px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: block;
+    text-align: center;
+    padding: 0;
+    margin: 0;
+    padding-top: 10px;
+    display: block;
+    font-size: 0.95rem;
+}}
+.extra-src-img-box .img-outer {{
+    display: flex;
+    flex-direction: column;
+}}
+.extra-src-img-box .img-wrapper {{
+    position: relative;
+    overflow: hidden;
+    border: 1px solid #000;
+    background: #000;
+    width: 400px;
+    height: 280px;
+    margin: 0;
+    margin-bottom: 0px !important;
+    border-radius: 5px;
+    -webkit-box-shadow: 8px 8px 22px -16px rgba(0, 0, 0, 1);
+    -moz-box-shadow: 8px 8px 22px -16px rgba(0, 0, 0, 1);
+    box-shadow: 8px 8px 22px -16px rgba(0, 0, 0, 1);
+}}
+.extra-src-img-box .img-wrapper:hover {{
+    border: 1px solid gray;
+}}
+.extra-src-img-box img {{
+    margin-bottom: 2px;
+    padding-bottom: 0px;
+    display: block;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}}
+
+/* common */
 .toggle-expanded {{
     transform: rotateX(180deg);
 }}
+.append_input {{
+    margin: 0;
+    padding: 0;
+}}
+.append_output {{
+    margin: 0;
+    padding: 0;
+}}
+.empty_list {{
+}}
 .spinner {{
   display: inline-block;
   animation: spin 2s linear infinite;
@@ -300,6 +309,8 @@ code {{
   width: 100% !important;
   height: 100% !important;
 }}
+
+/* anims */
 @keyframes spin {{
   from {{
     transform: rotate(0deg);