From a797cc408df1fef7b81d56afa0df05c5c1913c0e Mon Sep 17 00:00:00 2001 From: Marcin Szczyglinski Date: Sun, 17 Dec 2023 03:53:17 +0100 Subject: [PATCH] Fixes --- pygpt.aip | 280 +++++++++--------- src/pygpt_net/core/assistants.py | 11 +- src/pygpt_net/core/camera.py | 0 src/pygpt_net/core/controller/camera.py | 0 src/pygpt_net/core/ui/attachments_uploaded.py | 2 + src/pygpt_net/core/ui/widget/audio.py | 0 src/pygpt_net/core/ui/widget/camera.py | 0 src/pygpt_net/core/ui/widget/elements.py | 0 src/pygpt_net/data/logo.png | Bin 9 files changed, 150 insertions(+), 143 deletions(-) mode change 100644 => 100755 src/pygpt_net/core/camera.py mode change 100644 => 100755 src/pygpt_net/core/controller/camera.py mode change 100644 => 100755 src/pygpt_net/core/ui/attachments_uploaded.py mode change 100644 => 100755 src/pygpt_net/core/ui/widget/audio.py mode change 100644 => 100755 src/pygpt_net/core/ui/widget/camera.py mode change 100644 => 100755 src/pygpt_net/core/ui/widget/elements.py mode change 100644 => 100755 src/pygpt_net/data/logo.png diff --git a/pygpt.aip b/pygpt.aip index 9ac32e5b8..bbae7cacb 100755 --- a/pygpt.aip +++ b/pygpt.aip @@ -16,10 +16,10 @@ - + - + @@ -137,143 +137,143 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -785,7 +785,7 @@ - + diff --git a/src/pygpt_net/core/assistants.py b/src/pygpt_net/core/assistants.py index 2e117944c..7ed454d23 100755 --- a/src/pygpt_net/core/assistants.py +++ b/src/pygpt_net/core/assistants.py @@ -184,10 +184,15 @@ def import_files(self, assistant, data): for file in data: id = file.id remote_ids.append(id) - + name = "" + path = "" if id in assistant.files: - name = assistant.files[id]['name'] - path = assistant.files[id]['path'] + if 'name' in assistant.files[id] and assistant.files[id]['name'] != '': + name = assistant.files[id]['name'] + else: + name = id + if 'path' in assistant.files[id]: + path = assistant.files[id]['path'] elif id in assistant.attachments: name = assistant.attachments[id].name path = assistant.attachments[id].path diff --git a/src/pygpt_net/core/camera.py b/src/pygpt_net/core/camera.py old mode 100644 new mode 100755 diff --git a/src/pygpt_net/core/controller/camera.py b/src/pygpt_net/core/controller/camera.py old mode 100644 new mode 100755 diff --git a/src/pygpt_net/core/ui/attachments_uploaded.py b/src/pygpt_net/core/ui/attachments_uploaded.py old mode 100644 new mode 100755 index da2769892..a8eb1e41b --- a/src/pygpt_net/core/ui/attachments_uploaded.py +++ b/src/pygpt_net/core/ui/attachments_uploaded.py @@ -95,6 +95,8 @@ def update_list(self, id, data): self.window.models[id].removeRows(0, self.window.models[id].rowCount()) i = 0 for uuid in data: + if 'name' not in data[uuid]: + continue self.window.models[id].insertRow(i) self.window.models[id].setData(self.window.models[id].index(i, 0), data[uuid]['name']) self.window.models[id].setData(self.window.models[id].index(i, 1), data[uuid]['path']) diff --git a/src/pygpt_net/core/ui/widget/audio.py b/src/pygpt_net/core/ui/widget/audio.py old mode 100644 new mode 100755 diff --git a/src/pygpt_net/core/ui/widget/camera.py b/src/pygpt_net/core/ui/widget/camera.py old mode 100644 new mode 100755 diff --git a/src/pygpt_net/core/ui/widget/elements.py b/src/pygpt_net/core/ui/widget/elements.py old mode 100644 new mode 100755 diff --git a/src/pygpt_net/data/logo.png b/src/pygpt_net/data/logo.png old mode 100644 new mode 100755