Merge pull request #66

* Remove sub-optimal model warning, update model list and dependencies …

* Bump version to v2025.06.25 in setup.cfg

Author: royerloic

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = napari-chatgpt
-version = v2024.10.18.1
+version = v2025.06.25
 description = A napari plugin to process and analyse images with chatGPT.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -55,7 +55,7 @@ install_requires =
     xarray
     arbol
     playwright
-    duckduckgo-search==6.3.2
+    duckduckgo-search==8.0.4
     ome-zarr
     transformers
     cryptography

src/napari_chatgpt/_widget.py

@@ -422,16 +422,6 @@ def _start_omega(self):
                 # Model selected:
                 main_llm_model_name = self.model_combo_box.currentText()
 
-                # Warn users with a modal window that the selected model might be sub-optimal:
-                if 'gpt-4' not in main_llm_model_name and 'claude-3-opus' not in main_llm_model_name:
-                    aprint("Warning: you did not select a gpt-4 level model. Omega's cognitive and coding abilities will be degraded.")
-                    show_warning_dialog(f"You have selected this model: '{main_llm_model_name}'. "
-                                        f"This is not a GPT4 or Claude-3-opus level model. "
-                                        f"Omega's cognitive and coding abilities will be degraded. "
-                                        f"It might even completely fail or be too slow. "
-                                        f"Please visit <a href='https://github.com/royerlab/napari-chatgpt/wiki/OpenAIKey'>our wiki</a> "
-                                        f"for information on how to gain access to GPT4 (or Claude-3).")
-
                 # Set tool LLM model name via configuration file.
                 tool_llm_model_name = self.config.get('tool_llm_model_name', 'same')
                 if tool_llm_model_name.strip() == 'same':

src/napari_chatgpt/omega/tools/instructions.py

@@ -23,5 +23,7 @@
 - If you need to get the selected layer in the napari viewer, use the following code: `viewer.layers.selection.active`.
 - napari layers do not have a 'type' field, if you need to check the type of a layer, use for example the following code: `isinstance(layer, napari.layers.Shapes)`.
 - If you need to rotate the viewer camera to a specific set of angles, use the following code: `viewer.camera.angles = (angle_z, angle_y, angle_x)`  .
+- When required, import 'ArrayLike' from 'numpy.typing'.
+
 """
 

src/napari_chatgpt/omega/tools/napari/cell_nuclei_segmentation_tool.py

@@ -179,7 +179,7 @@ def _get_segmentation_prompt() -> str:
 - Assume that the functions 'cellpose_segmentation()', 'stardist_segmentation()', and 'classic_segmentation()' are available and within scope of your code.
 - DO NOT add the segmentation to the napari viewer, this is done automatically by the system.
 - DO NOT directly use the Cellpose or StarDist APIs: 'models.cellpose(...', 'model.predict_instances(...', etc.
-- Response must be only the python function: 'segment(viewer)->ArrayLike'.
+- Response must be only the python function: 'segment(viewer)' that returns an array.
 - Convert arrays to float type before processing. Intermediate or local arrays should be of type float. Constants for: np.full(), np.ones(), np.zeros(), ... should be floats (for example 1.0).
 - If the request mentions 'this/that/the image/layer' then most likely it refers to the last added image or layer.
 - Convert the segmented image to 'np.uint32' before returning the segmentation.

src/napari_chatgpt/omega/tools/napari/widget_maker_tool.py

@@ -96,8 +96,6 @@
 ```
 - If you need to import other libraries, do so outside of the function.
 
-
-
 """
 
 _code_prefix = """

src/napari_chatgpt/utils/anthropic/model_list.py

@@ -1,32 +1,20 @@
 from arbol import asection
 
 
-
-
-def get_anthropic_model_list() -> list:
+def get_anthropic_model_list() -> list[str]:
     """
-    Get the list of all Anthropic  models.
-
-    Parameters
-    ----------
-    filter : str
-        Filter to apply to the list of models.
-    Returns
-    -------
-    list
-        List of models.
+    Return a list of all *current, non-deprecated* Anthropic Claude models.
 
+    Snapshot dates ensure deterministic behaviour.  Last verified: 2025-06-25.
     """
-
-    with asection("Enumerating all Anthropic models:"):
-        model_list = []
-
-        model_list.append('claude-3-opus-20240229')
-        model_list.append('claude-3-sonnet-20240229')
-        model_list.append('claude-3-haiku-20240307')
-        model_list.append('claude-3-5-sonnet-20240620')
-
-        return model_list
-
-
-
+    with asection("Enumerating active Anthropic models"):
+        return [
+            "claude-3-opus-20240229",
+            "claude-3-haiku-20240307",
+            "claude-3-5-sonnet-20240620",
+            "claude-3-5-sonnet-20241022",
+            "claude-3-5-haiku-20241022",
+            "claude-3-7-sonnet-20250219",
+            "claude-sonnet-4-20250514",
+            "claude-opus-4-20250514",
+        ]

src/napari_chatgpt/utils/api_keys/api_key.py

@@ -46,6 +46,7 @@ def set_api_key(api_name: str) -> bool:
             aprint(f"Requesting key from user via user interface...")
             api_key = request_if_needed_api_key_dialog(api_name)
 
+
         # Potentially releases the Qt app, MUST BE KEPT!:
         app = None
 

src/napari_chatgpt/utils/openai/default_model.py

@@ -30,7 +30,13 @@ def model_key(model):
             # Use the length of the model name as a secondary sorting criterion
             length = len(model)
             # Sort by main version (descending), then by length (ascending)
-            return (-float(main_version), length)
+            try:
+                key = (-float(main_version), length)
+            except Exception:
+                # If conversion to float fails, return a tuple that ensures this model is sorted last
+                key = (float('inf'), length)
+
+            return key
 
         sorted_model_list = sorted(model_list, key=model_key)
 

src/napari_chatgpt/utils/openai/gpt_vision.py

@@ -4,7 +4,7 @@
 from napari_chatgpt.utils.openai.model_list import get_openai_model_list
 
 
-def is_gpt_vision_available(vision_model_name: str = 'gpt-4-vision-preview') -> bool:
+def is_gpt_vision_available(vision_model_name: str = 'gpt-4') -> bool:
     """
     Check if GPT-vision is available.
 
@@ -29,7 +29,7 @@ def is_gpt_vision_available(vision_model_name: str = 'gpt-4-vision-preview') ->
 
 def describe_image(image_path: str,
                    query: str = 'Here is an image, please carefully describe it in detail.',
-                   model: str = "gpt-4-vision-preview",
+                   model: str = "gpt-4o",
                    max_tokens: int = 4096,
                    number_of_tries: int = 4,
                    ) -> str:

src/napari_chatgpt/utils/openai/model_list.py

@@ -48,6 +48,10 @@ def get_openai_model_list(filter: str = 'gpt', verbose: bool = False) -> list:
                     if verbose:
                         aprint(model_id)
 
+            # Remove any models that contain the following substrings:
+            model_list = [m for m in model_list if
+                          not any(x in m for x in ['vision', 'instruct', 'turbo-instruct', 'preview', 'realtime', 'audio', 'transcribe', 'image'])]
+
             return model_list
 
         except Exception as e: