pyqt-code-editor 0.0.65__tar.gz → 1.0.0__tar.gz

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqt_code_editor
-Version: 0.0.65
+Version: 1.0.0
 Summary: Fully featured code-editor widgets for PyQt
 Keywords: code editor,pyqt,ide
 Author-email: Sebastiaan Mathôt <s.mathot@cogsci.nl>
@@ -63,7 +63,7 @@ Features:
 
 ### SigmundAI for collaborative code editing
 
-You can work together with SigmundAI on the currently active document or selected text. To activate SigmundAI integration, simply log into <https://sigmundai.eu> (subscription required). Sigmund Analyst will then automatically connect to SigmundAI when you enable the Sigmund panel in the toolbar.
+You can code together with SigmundAI. This works similarly to (and is an alternative to) apps such as Claude Code, Codex, and Mistral Vibe. To activate SigmundAI integration, simply log into <https://sigmundai.eu> (subscription required). Sigmund Analyst will then automatically connect to SigmundAI when you enable the Sigmund panel in the toolbar.
 
 
 ### Mistral Codestral for as-you-type suggestions
@@ -83,10 +83,12 @@ The easiest way to install Sigmund Analys on Windows is to install OpenSesame, w
 
 ### Linux/ Ubuntu
 
-The easiest way to install Sigmund Analyst on Linux is to download and run the installer script. This will create a Virtual Environment, pip install Sigmund Analyst and all dependencies into this environment, and add a Desktop file to your system to easily start Sigmund Analyst. To upgrade, simply run the script again.
+The easiest way to install Sigmund Analyst on Linux is to download and run the installer script. This will create a Virtual Environment, pip install Sigmund Analyst and all dependencies into this environment, and add a Desktop file to your system to easily start Sigmund Analyst. To upgrade, simply run the script again. (This is actually the OpenSesame installation script, which is bundled with Sigmund Analyst.)
+
+Currently, the Linux installer is tested on Ubuntu 26.04.
 
 ```
-bash <(curl -L https://raw.githubusercontent.com/open-cogsci/pyqt_code_editor/refs/heads/master/install_sigmund_analyst.sh)
+bash <(curl -L https://github.com/open-cogsci/OpenSesame/raw/refs/heads/4.1/linux-installer.sh) --install
 ```
 
 

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/__init__.py

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.65'
+__version__ = '1.0.0'

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/_settings.py

@@ -121,6 +121,7 @@ class Settings(QObject):
     
     # Sigmund provider
     sigmund_review_actions = SettingProperty(True, "Sigmund")
+    sigmund_link_to_workspace = SettingProperty(True, "Sigmund")
     sigmund_max_context = SettingProperty(2000, "Sigmund")
     sigmund_fim_endpoint = SettingProperty('http://localhost:5000/code_completion/fim', "Sigmund")
     sigmund_token = SettingProperty(None, "Sigmund")

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/app.py

@@ -457,29 +457,10 @@ class SigmundAnalyst(QMainWindow):
         dlg.exec_()
             
             
-def handle_output(text, content):
-    print('***')
-    print(text)
-    # print('---')
-    # for part in content['parts']:
-        # print(part)
-    # print(content)
-    print('***')    
-    
-        
 def launch_app():
     app = QApplication(sys.argv)
     settings.set_font_family()
     window = SigmundAnalyst()
     window.show()
-    window._jupyter_console.execution_complete.connect(handle_output)
     window._toggle_dock_widget(window._jupyter_console)
-    # window._jupyter_console.execute_code('''
-# from matplotlib import pyplot as plt
-# plt.plot([1,2,3,4])
-# plt.show()
-# print(10)
-# # int('x')
-# 11
-# ''')
     sys.exit(app.exec_())

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/components/editor_panel.py

@@ -98,6 +98,9 @@ class EditorPanel(QWidget):
         logger.info(f"active editor = {editor}")
         self._active_editor = editor
         self._active_tab_widget = self._active_editor.parent().parent()
+        current_file = editor.code_editor_file_path
+        if current_file is not None:
+            settings.current_folder = os.path.dirname(current_file)
     
     def open_file(self, path=None, line_number=None):
         if path is not None:

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/components/project_explorer.py

@@ -169,6 +169,7 @@ class ProjectExplorer(QDockWidget):
         self._filter_proxy.setSourceModel(self._model)
 
         self._display_root = root_path or QDir.currentPath()
+        settings.current_folder = self._display_root
 
         # Create a container widget and layout, so we can have the treeview + an optional checkbox
         container_widget = QWidget(self)

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/components/sigmund/editor_workspace.py

@@ -89,12 +89,15 @@ class EditorWorkspace:
             editor_content = self._normalize_line_breaks(text_cursor.selectedText())
         else:
             editor_content = self._editor.toPlainText()
-        
-        if content in (editor_content, self.strip_content(editor_content)):
-            return False
-        return True
+        # Treat None content as empty
+        if content is None:
+            content = ''
+        # Compare line-by-line, ignoring trailing whitespace on each line
+        content_lines = [line.rstrip() for line in content.splitlines()]
+        editor_lines = [line.rstrip() for line in editor_content.splitlines()]
+        return content_lines != editor_lines
     
     def strip_content(self, content):
         if content is None:
             return ''
-        return content
+        return content.strip()

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/components/sigmund/sigmund.py

@@ -10,11 +10,13 @@ class Sigmund(Dock):
     def __init__(self, parent, editor_panel):
         super().__init__('Sigmund', parent)
         self.setObjectName("sigmund")
-        workspace = EditorWorkspace(editor_panel)
         self.sigmund_widget = SigmundAnalystWidget(
             self, editor_panel)
         self.sigmund_widget.setStyleSheet(f'font-size: {settings.font_size}pt')
-        self.sigmund_widget.set_workspace_manager(workspace)
+        self.sigmund_widget._workspace_manager = EditorWorkspace(editor_panel)
+        if settings.sigmund_link_to_workspace:
+            self.sigmund_widget.set_workspace_manager(
+                self.sigmund_widget._workspace_manager)
         self.setWidget(self.sigmund_widget)
 
     def setVisible(self, visible):

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/components/sigmund/sigmund_analyst_chat_widget.py

@@ -34,6 +34,14 @@ class SigmundAnalystChatWidget(ChatWidget):
         self._review_actions_checkbox.stateChanged.connect(
             self._on_review_actions_changed)
         options_layout.addWidget(self._review_actions_checkbox)
+        # 'Link editor (or selected text) to workspace' checkbox
+        self._link_to_workspace_checkbox = QCheckBox(
+            "Link active editor (or selected text) to workspace")
+        self._link_to_workspace_checkbox.setChecked(
+            settings.sigmund_link_to_workspace)
+        self._link_to_workspace_checkbox.stateChanged.connect(
+            self._on_link_to_workspace_changed)
+        options_layout.addWidget(self._link_to_workspace_checkbox)
         # Insert the options container before the input container
         main_layout.insertWidget(main_layout.count(), options_container)
 
@@ -58,3 +66,14 @@ class SigmundAnalystChatWidget(ChatWidget):
                 return
         self._review_warning_label.setVisible(not review)
         settings.sigmund_review_actions = review
+
+    def _on_link_to_workspace_changed(self, state):
+        link_to_workspace = bool(state)
+        sigmund_widget = self.parent()
+        if link_to_workspace:
+            sigmund_widget.set_workspace_manager(
+                sigmund_widget._workspace_manager)
+        else:
+            sigmund_widget.set_workspace_manager(None)
+        settings.sigmund_link_to_workspace = link_to_workspace
+

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/components/sigmund/sigmund_analyst_widget.py

@@ -43,15 +43,22 @@ class SigmundAnalystWidget(SigmundWidget):
         # Store execution results
         self._execution_result = None
         self._execution_loop = None
-        self._working_directory = None
+
+    @property
+    def _working_directory(self):
+        """The current working directory, based on the most recently active
+        editor. Falls back to os.getcwd() if no folder is set.
+        """
+        folder = settings.current_folder
+        return folder if folder is not None else os.getcwd()
 
     def _resolve_path(self, path):
         """Resolve a path relative to the current working directory.
         Absolute paths are returned unchanged.
         """
-        if self._working_directory is not None and not os.path.isabs(path):
-            return os.path.join(self._working_directory, path)
-        return path
+        if os.path.isabs(path):
+            return path
+        return os.path.join(self._working_directory, path)
 
     def _confirm_action(self, action_type, details):
         """Show a confirmation dialog for the proposed action.
@@ -171,9 +178,8 @@ class SigmundAnalystWidget(SigmundWidget):
         if self._jupyter_console is None:
             return 'Code execution not supported.'
         self._app._toggle_dock_widget(self._jupyter_console, show=True)
-        if self._working_directory is not None:
-            self._jupyter_console.change_directory(self._working_directory)
-            time.sleep(.5)
+        self._jupyter_console.change_directory(self._working_directory)
+        time.sleep(.5)
         self._execution_result = None
         self._execution_loop = QEventLoop()
         QTimer.singleShot(30000, self._execution_loop.quit)  # 30 second timeout
@@ -267,43 +273,31 @@ class SigmundAnalystWidget(SigmundWidget):
 
     def send_user_message(self, text, *args, **kwargs):
         current_path = self._editor.code_editor_file_path
-        # If the editor is not linked to a file, simply use the working 
-        # directory.
         if current_path is None:
             current_path = '[unsaved file]'
-            working_directory = os.getcwd()
-        else:
-            working_directory = os.path.dirname(current_path)
 
-        # Initialize with default value
-        working_directory_contents = "(No directory contents available)"
+        working_directory = self._working_directory
 
         # Get directory contents with priority to top-level items
         top_level = []
         all_items = []
 
-        # Only wrap file system operations in try-except
         try:
-            # Get top-level items (depth=1)
             top_level = [f for f in os.listdir(working_directory)
                         if os.path.isfile(os.path.join(working_directory, f))
                         or os.path.isdir(os.path.join(working_directory, f))]
 
-            # Then get deeper items if we haven't reached our limit
             remaining_slots = max(0, 20 - len(top_level))
             if remaining_slots > 0:
                 for root, dirs, files in os.walk(working_directory):
-                    # Skip the top level since we already have it
                     if root == working_directory:
                         continue
-                    # Add files first
                     for file in files:
                         if remaining_slots <= 0:
                             break
                         rel_path = os.path.relpath(os.path.join(root, file), working_directory)
                         all_items.append(f".\\{rel_path}")
                         remaining_slots -= 1
-                    # Then add directories if we still have space
                     for dir in dirs:
                         if remaining_slots <= 0:
                             break
@@ -311,7 +305,6 @@ class SigmundAnalystWidget(SigmundWidget):
                         all_items.append(f".\\{rel_path}\\")
                         remaining_slots -= 1
 
-            # Combine top level and deeper items
             working_directory_contents = "\n".join(
                 sorted([f".\\{item}" if os.path.isfile(os.path.join(working_directory, item))
                  else f".\\{item}\\" for item in top_level] +
@@ -340,6 +333,5 @@ Overview of working directory:
 ```
 '''
         self._transient_system_prompt = system_prompt
-        self._working_directory = working_directory
         super().send_user_message(text, *args, **kwargs)
         self._attachments = None

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/pyqt_code_editor/worker/providers/codestral.py

@@ -14,7 +14,7 @@ def codestral_complete(code: str, cursor_pos: int,
         return []
 
     if client is None:
-        from mistralai import Mistral
+        from mistralai.client import Mistral
         client = Mistral(api_key=settings.codestral_api_key)
 
     if len(code) < settings.codestral_min_context:

{pyqt_code_editor-0.0.65 → pyqt_code_editor-1.0.0}/readme.md

@@ -31,7 +31,7 @@ Features:
 
 ### SigmundAI for collaborative code editing
 
-You can work together with SigmundAI on the currently active document or selected text. To activate SigmundAI integration, simply log into <https://sigmundai.eu> (subscription required). Sigmund Analyst will then automatically connect to SigmundAI when you enable the Sigmund panel in the toolbar.
+You can code together with SigmundAI. This works similarly to (and is an alternative to) apps such as Claude Code, Codex, and Mistral Vibe. To activate SigmundAI integration, simply log into <https://sigmundai.eu> (subscription required). Sigmund Analyst will then automatically connect to SigmundAI when you enable the Sigmund panel in the toolbar.
 
 
 ### Mistral Codestral for as-you-type suggestions
@@ -51,10 +51,12 @@ The easiest way to install Sigmund Analys on Windows is to install OpenSesame, w
 
 ### Linux/ Ubuntu
 
-The easiest way to install Sigmund Analyst on Linux is to download and run the installer script. This will create a Virtual Environment, pip install Sigmund Analyst and all dependencies into this environment, and add a Desktop file to your system to easily start Sigmund Analyst. To upgrade, simply run the script again.
+The easiest way to install Sigmund Analyst on Linux is to download and run the installer script. This will create a Virtual Environment, pip install Sigmund Analyst and all dependencies into this environment, and add a Desktop file to your system to easily start Sigmund Analyst. To upgrade, simply run the script again. (This is actually the OpenSesame installation script, which is bundled with Sigmund Analyst.)
+
+Currently, the Linux installer is tested on Ubuntu 26.04.
 
 ```
-bash <(curl -L https://raw.githubusercontent.com/open-cogsci/pyqt_code_editor/refs/heads/master/install_sigmund_analyst.sh)
+bash <(curl -L https://github.com/open-cogsci/OpenSesame/raw/refs/heads/4.1/linux-installer.sh) --install
 ```