Tempo fix for v2 compatibility

redbird/base.py

@@ -6,7 +6,7 @@
 from dataclasses import dataclass
 import warnings
 
-from pydantic import BaseModel, Field, validator
+from pydantic.v1 import BaseModel, Field, validator
 
 from redbird.exc import ConversionWarning, DataToItemError, KeyFoundError, ItemToDataError, _handle_conversion_error
 from redbird.utils.case import to_case

redbird/repos/csv.py

@@ -5,7 +5,7 @@
 
 import csv
 
-from pydantic import BaseModel, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Field, PrivateAttr
 from redbird import BaseRepo, BaseResult
 from redbird.base import Data, Item
 from redbird.templates import TemplateRepo

redbird/repos/json.py

@@ -5,7 +5,7 @@
 
 import csv, json
 
-from pydantic import BaseModel, PrivateAttr
+from pydantic.v1 import BaseModel, PrivateAttr
 from redbird import BaseRepo, BaseResult
 from redbird.base import Data, Item
 from redbird.templates import TemplateRepo

redbird/repos/memory.py

@@ -2,7 +2,7 @@
 from operator import getitem
 from typing import Any, Dict, List
 
-from pydantic import BaseModel, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Field, PrivateAttr
 from redbird import BaseRepo, BaseResult
 from redbird.templates import TemplateRepo
 from redbird.exc import KeyFoundError

redbird/repos/mongo.py

@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 
-from pydantic import BaseModel, Field, ValidationError
+from pydantic.v1 import BaseModel, Field, ValidationError
 
 from redbird.base import BaseResult, BaseRepo
 from redbird.exc import KeyFoundError

redbird/repos/rest.py

@@ -2,7 +2,7 @@
 import urllib.parse as urlparse
 from typing import Any, Callable, Dict, Iterable, List, Optional, Union
 
-from pydantic import BaseModel, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Field, PrivateAttr
 
 from redbird.packages import requests
 from redbird.oper import GreaterEqual, GreaterThan, LessEqual, LessThan, NotEqual, Operation

redbird/repos/sqlalchemy.py

@@ -3,7 +3,7 @@
 import typing
 import sys
 
-from pydantic import BaseModel, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Field, PrivateAttr
 from redbird import BaseRepo, BaseResult
 from redbird.dummy import DummySession
 from redbird.templates import TemplateRepo

redbird/sql/expressions.py

@@ -10,7 +10,7 @@
 from redbird.oper import Between, In, Operation, skip
 from redbird.packages import sqlalchemy, import_exists
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 try:
@@ -707,7 +707,7 @@ def create_from_model(self, model:BaseModel, primary_column=None):
             for name, field in model.__fields__.items()
         ]
         self.create(sql_cols)
-  
+
     def execute(self, *args, **kwargs):
         """Execute SQL statement or raw SQL.
 

redbird/test/common/conftest.py

@@ -17,7 +17,7 @@
 from redbird.repos.mongo import MongoRepo
 from redbird.oper import greater_equal, greater_than, less_equal, less_than, not_equal
 
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 # ------------------------
 # TEST ITEMS

redbird/test/common/test_common.py

@@ -16,7 +16,7 @@
 from redbird.repos.mongo import MongoRepo
 from redbird.oper import in_, skip, between, greater_equal, greater_than, less_equal, less_than, not_equal
 
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 
 TEST_CASES = [

redbird/test/logging/test_handler.py

@@ -1,7 +1,7 @@
 
 import logging
 from typing import Optional
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 import pytest
 

redbird/test/repo/test_csv.py

@@ -2,7 +2,7 @@
 from typing import Optional
 
 from redbird.repos import CSVFileRepo
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 class Item(BaseModel):
     id: str

redbird/test/repo/test_json.py

@@ -5,7 +5,7 @@
 import pytest
 
 from redbird.repos import JSONDirectoryRepo
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 class Item(BaseModel):
     id: str

redbird/test/repo/test_mongo.py

@@ -4,7 +4,7 @@
 from redbird.repos import MongoRepo
 
 import pytest
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 class Item(BaseModel):
     id: str

redbird/test/repo/test_sql.py

@@ -4,7 +4,7 @@
 import typing
 import pytest
 from redbird.repos import SQLRepo
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 try:
     from typing import Literal

redbird/test/sql/test_create.py

@@ -1,5 +1,5 @@
 from typing import Optional
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from datetime import date
 import pytest
 

redbird/test/test_creation.py

@@ -1,5 +1,5 @@
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 import pytest
 from redbird import BaseRepo, BaseResult
 from redbird.repos import MemoryRepo