local-deep-research 0.4.3__py3-none-any.whl → 0.5.0__py3-none-any.whl

local_deep_research/web/services/resource_service.py

@@ -30,9 +30,15 @@ def get_resources_for_research(research_id):
 
         resources = []
         for row in cursor.fetchall():
-            id, research_id, title, url, content_preview, source_type, metadata_str = (
-                row
-            )
+            (
+                id,
+                research_id,
+                title,
+                url,
+                content_preview,
+                source_type,
+                metadata_str,
+            ) = row
 
             # Parse metadata if available
             metadata = {}
@@ -40,7 +46,9 @@ def get_resources_for_research(research_id):
                 try:
                     metadata = json.loads(metadata_str)
                 except json.JSONDecodeError:
-                    logger.warning(f"Invalid JSON in metadata for resource {id}")
+                    logger.warning(
+                        f"Invalid JSON in metadata for resource {id}"
+                    )
 
             resources.append(
                 {
@@ -58,12 +66,19 @@ def get_resources_for_research(research_id):
         return resources
 
     except Exception as e:
-        logger.error(f"Error retrieving resources for research {research_id}: {str(e)}")
+        logger.error(
+            f"Error retrieving resources for research {research_id}: {str(e)}"
+        )
         raise
 
 
 def add_resource(
-    research_id, title, url, content_preview=None, source_type="web", metadata=None
+    research_id,
+    title,
+    url,
+    content_preview=None,
+    source_type="web",
+    metadata=None,
 ):
     """
     Add a new resource to the research_resources table
@@ -104,11 +119,15 @@ def add_resource(
         conn.commit()
         conn.close()
 
-        logger.info(f"Added resource {resource_id} for research {research_id}: {title}")
+        logger.info(
+            f"Added resource {resource_id} for research {research_id}: {title}"
+        )
         return resource_id
 
     except Exception as e:
-        logger.error(f"Error adding resource for research {research_id}: {str(e)}")
+        logger.error(
+            f"Error adding resource for research {research_id}: {str(e)}"
+        )
         raise
 
 
@@ -127,7 +146,9 @@ def delete_resource(resource_id):
         cursor = conn.cursor()
 
         # First check if the resource exists
-        cursor.execute("SELECT id FROM research_resources WHERE id = ?", (resource_id,))
+        cursor.execute(
+            "SELECT id FROM research_resources WHERE id = ?", (resource_id,)
+        )
         result = cursor.fetchone()
 
         if not result:
@@ -135,13 +156,17 @@ def delete_resource(resource_id):
             return False
 
         # Delete the resource
-        cursor.execute("DELETE FROM research_resources WHERE id = ?", (resource_id,))
+        cursor.execute(
+            "DELETE FROM research_resources WHERE id = ?", (resource_id,)
+        )
 
         rows_affected = cursor.rowcount
         conn.commit()
         conn.close()
 
-        logger.info(f"Deleted resource {resource_id}, {rows_affected} rows affected")
+        logger.info(
+            f"Deleted resource {resource_id}, {rows_affected} rows affected"
+        )
         return rows_affected > 0
 
     except Exception as e:

local_deep_research/web/services/settings_manager.py

@@ -47,6 +47,8 @@ class SettingsManager:
 
     _UI_ELEMENT_TO_SETTING_TYPE = {
         "text": str,
+        # SQLAlchemy should already handle JSON parsing.
+        "json": lambda x: x,
         "password": str,
         "select": str,
         "number": float,
@@ -65,12 +67,17 @@ class SettingsManager:
         self.db_first = True  # Always prioritize DB settings
 
         # Load default settings.
-        default_settings = pkg_resources.read_text(defaults, "default_settings.json")
+        default_settings = pkg_resources.read_text(
+            defaults, "default_settings.json"
+        )
         self.default_settings = json.loads(default_settings)
 
     def __get_typed_setting_value(
-        self, setting: Type[Setting], default: Any = None, check_env: bool = True
-    ) -> str | float | bool | None:
+        self,
+        setting: Type[Setting],
+        default: Any = None,
+        check_env: bool = True,
+    ) -> Any:
         """
         Extracts the value for a particular setting, ensuring that it has the
         correct type.
@@ -86,7 +93,9 @@ class SettingsManager:
             The value of the setting.
 
         """
-        setting_type = self._UI_ELEMENT_TO_SETTING_TYPE.get(setting.ui_element, None)
+        setting_type = self._UI_ELEMENT_TO_SETTING_TYPE.get(
+            setting.ui_element, None
+        )
         if setting_type is None:
             logger.warning(
                 "Got unknown type {} for setting {}, returning default value.",
@@ -119,7 +128,9 @@ class SettingsManager:
             )
             return default
 
-    def get_setting(self, key: str, default: Any = None, check_env: bool = True) -> Any:
+    def get_setting(
+        self, key: str, default: Any = None, check_env: bool = True
+    ) -> Any:
         """
         Get a setting value
 
@@ -139,8 +150,12 @@ class SettingsManager:
                     self.db_session.query(Setting)
                     # This will find exact matches and any subkeys.
                     .filter(
-                        or_(Setting.key == key, Setting.key.startswith(f"{key}."))
-                    ).all()
+                        or_(
+                            Setting.key == key,
+                            Setting.key.startswith(f"{key}."),
+                        )
+                    )
+                    .all()
                 )
                 if len(settings) == 1:
                     # This is a bottom-level key.
@@ -152,12 +167,16 @@ class SettingsManager:
                     settings_map = {}
                     for setting in settings:
                         output_key = setting.key.removeprefix(f"{key}.")
-                        settings_map[output_key] = self.__get_typed_setting_value(
-                            setting, default, check_env
+                        settings_map[output_key] = (
+                            self.__get_typed_setting_value(
+                                setting, default, check_env
+                            )
                         )
                     return settings_map
             except SQLAlchemyError as e:
-                logger.error(f"Error retrieving setting {key} from database: {e}")
+                logger.error(
+                    f"Error retrieving setting {key} from database: {e}"
+                )
 
         # Return default if not found
         return default
@@ -178,7 +197,9 @@ class SettingsManager:
         if self.db_session:
             try:
                 setting = (
-                    self.db_session.query(Setting).filter(Setting.key == key).first()
+                    self.db_session.query(Setting)
+                    .filter(Setting.key == key)
+                    .first()
                 )
                 if setting:
                     setting.value = value
@@ -255,7 +276,9 @@ class SettingsManager:
                         # variable is set.
                         result[setting.key]["editable"] = False
             except SQLAlchemyError as e:
-                logger.error(f"Error retrieving all settings from database: {e}")
+                logger.error(
+                    f"Error retrieving all settings from database: {e}"
+                )
 
         return result
 
@@ -346,7 +369,9 @@ class SettingsManager:
             return db_setting
 
         except SQLAlchemyError as e:
-            logger.error(f"Error creating/updating setting {setting_obj.key}: {e}")
+            logger.error(
+                f"Error creating/updating setting {setting_obj.key}: {e}"
+            )
             self.db_session.rollback()
             return None
 
@@ -362,12 +387,18 @@ class SettingsManager:
             True if successful, False otherwise
         """
         if not self.db_session:
-            logger.warning("No database session available, cannot delete setting")
+            logger.warning(
+                "No database session available, cannot delete setting"
+            )
             return False
 
         try:
             # Remove from database
-            result = self.db_session.query(Setting).filter(Setting.key == key).delete()
+            result = (
+                self.db_session.query(Setting)
+                .filter(Setting.key == key)
+                .delete()
+            )
 
             if commit:
                 self.db_session.commit()
@@ -378,7 +409,9 @@ class SettingsManager:
             self.db_session.rollback()
             return False
 
-    def load_from_defaults_file(self, commit: bool = True, **kwargs: Any) -> None:
+    def load_from_defaults_file(
+        self, commit: bool = True, **kwargs: Any
+    ) -> None:
         """
         Import settings from the defaults settings file.
 
@@ -426,7 +459,9 @@ class SettingsManager:
         self.db_session.commit()
 
     @classmethod
-    def get_instance(cls, db_session: Optional[Session] = None) -> "SettingsManager":
+    def get_instance(
+        cls, db_session: Optional[Session] = None
+    ) -> "SettingsManager":
         """
         Get a singleton instance of the settings manager
 
@@ -501,7 +536,12 @@ class SettingsManager:
         elif key.startswith("llm."):
             if any(
                 param in key
-                for param in ["temperature", "max_tokens", "n_batch", "n_gpu_layers"]
+                for param in [
+                    "temperature",
+                    "max_tokens",
+                    "n_batch",
+                    "n_gpu_layers",
+                ]
             ):
                 category = "llm_parameters"
             else:

local_deep_research/web/services/settings_service.py

@@ -35,7 +35,9 @@ def get_setting(key: str, default: Any = None, db_session=None) -> Any:
     return manager.get_setting(key, default)
 
 
-def set_setting(key: str, value: Any, commit: bool = True, db_session=None) -> bool:
+def set_setting(
+    key: str, value: Any, commit: bool = True, db_session=None
+) -> bool:
     """
     Set a setting value
 
@@ -67,7 +69,9 @@ def get_all_settings(db_session=None) -> Dict[str, Any]:
 
 
 def create_or_update_setting(
-    setting: Union[Dict[str, Any], Setting], commit: bool = True, db_session=None
+    setting: Union[Dict[str, Any], Setting],
+    commit: bool = True,
+    db_session=None,
 ) -> Optional[Setting]:
     """
     Create or update a setting
@@ -116,7 +120,9 @@ def bulk_update_settings(
     return success
 
 
-def validate_setting(setting: Setting, value: Any) -> tuple[bool, Optional[str]]:
+def validate_setting(
+    setting: Setting, value: Any
+) -> tuple[bool, Optional[str]]:
     """
     Validate a setting value based on its type and constraints
 
@@ -127,6 +133,8 @@ def validate_setting(setting: Setting, value: Any) -> tuple[bool, Optional[str]]
     Returns:
         tuple[bool, Optional[str]]: (is_valid, error_message)
     """
-    from ..routes.settings_routes import validate_setting as routes_validate_setting
+    from ..routes.settings_routes import (
+        validate_setting as routes_validate_setting,
+    )
 
     return routes_validate_setting(setting, value)