fix(deps): Bump dependency and various Pydantic V2 updates

pyproject.toml

@@ -33,7 +33,7 @@ click-plugins = "^1.1.1"
 cli = ["click", "click_plugins"]
 
 [tool.poetry.group.dev.dependencies]
-pydantic-openapi-helper = "^1.0.2"
+pydantic-openapi-helper = "^1.0.4"
 coverage = ">=6"
 coveralls = ">=3"
 pytest = ">=6.2.4"

queenbee/base/basemodel.py

@@ -1,7 +1,6 @@
 """Queenbee utility functions."""
 import hashlib
-import json
-from typing import List, Union, Dict, Any
+from typing import List, Dict, Any, Optional
 
 import yaml
 from pydantic import BaseModel as PydanticBaseModel
@@ -150,14 +149,20 @@ def _referenced_values(self, var_names: List[str]) -> Dict[str, List[str]]:
 class BaseModel(BaseModelNoType):
     """BaseModel with functionality to return the object as a yaml string."""
 
-    type: str = Field('BaseModel', pattern='^BaseModel$')
+    type: str = Field(default='BaseModel', pattern='^BaseModel$')
 
-    annotations: Dict[str, Any] = Field(
+    annotations: Optional[Dict[str, Any]] = Field(
         default_factory=dict,
         description='An optional dictionary to add annotations to inputs. These '
-        'annotations will be used by the client side libraries.'
+        'annotations will be used by the client side libraries.',
+        validate_default=True
     )
 
+    @field_validator('annotations', mode='before')
+    @classmethod
+    def convert_none_to_empty_dict(cls, v):
+        return v if v is not None else {}
+
     @field_validator('type')
     @classmethod
     def ensure_type_match(cls, v: str) -> str:

queenbee/base/request.py

@@ -1,6 +1,5 @@
 import os
 import pathlib
-import platform
 from urllib import request
 from typing import Dict
 

queenbee/cli/config/view.py

@@ -1,8 +1,3 @@
-import os
-import shutil
-
-from pydantic import ValidationError
-
 try:
     import click
     from click_plugins import with_plugins

queenbee/cli/plugin/lint.py

@@ -22,7 +22,7 @@ def lint(path):
     try:
         op = Plugin.from_folder(path)
         obj = op.to_dict()
-        Plugin.parse_obj(obj)
+        Plugin.model_validate(obj)
     except ValidationError as error:
         raise click.ClickException(error)
     except FileNotFoundError as error:

queenbee/cli/recipe/link.py

@@ -1,9 +1,7 @@
 import os
 import shutil
 
-from pydantic import ValidationError
-
-from ...recipe import Recipe, BakedRecipe
+from ...recipe import Recipe
 
 try:
     import click

queenbee/cli/recipe/lint.py

@@ -1,7 +1,7 @@
 import os
 
 from pydantic import ValidationError
-from ...recipe import Recipe, BakedRecipe
+from ...recipe import BakedRecipe
 
 try:
     import click

queenbee/cli/recipe/package.py

@@ -2,7 +2,7 @@
 
 from pydantic import ValidationError
 
-from ...recipe import Recipe, BakedRecipe
+from ...recipe import BakedRecipe
 from ...repository import PackageVersion
 
 try:

queenbee/cli/repository/index.py

@@ -33,7 +33,10 @@ def index(path, index_path, new, force, skip):
         if new:
             repo_index = RepositoryIndex.from_folder(path)
         else:
-            repo_index = RepositoryIndex.parse_file(index_path)
+            with open(index_path, 'r') as f:
+                content = f.read()
+            repo_index = RepositoryIndex.model_validate_json(content)
+
             repo_index.merge_folder(path, force, skip)
     except ValueError as error:
         raise click.ClickException(error)

queenbee/cli/repository/manage.py

@@ -1,4 +1,3 @@
-import os
 import json
 
 try:
@@ -10,7 +9,6 @@
     )
 
 from ...config.repositories import RepositoryReference
-from ...repository.index import RepositoryIndex, RepositoryMetadata
 
 
 @click.command('add')

queenbee/cli/repository/search.py

@@ -1,6 +1,4 @@
-import os
 import json
-from urllib.parse import urlparse
 
 try:
     import click
@@ -10,8 +8,6 @@
         'click modules not installed. Try `pip install queenbee[cli]` command.'
     )
 
-from ...config.repositories import RepositoryReference
-
 
 @click.command('search')
 @click.option('-r', '--repository', help='Only search within the named repository')

queenbee/io/common.py

@@ -234,7 +234,7 @@ def parameter_unique_names(cls, v: List[Any]) -> List[Any]:
             if not hasattr(io, 'alias') or not io.alias:
                 # function inputs/outputs
                 return v
-            for alias in io['alias']:
+            for alias in io.alias:
                 for platform in alias.platform:
                     platforms.append(platform)
 
@@ -246,7 +246,7 @@ def parameter_unique_names(cls, v: List[Any]) -> List[Any]:
                     # no alias use the original name
                     names.append(io.name)
                     continue
-                for alias in io['alias']:
+                for alias in io.alias:
                     if platform in alias.platform:
                         names.append(alias.name)
                         break