Support both pydantic v1 and v2

thesadru · Jul 5, 2023 · a1ec09c · a1ec09c
1 parent a261c2b
commit a1ec09c
Show file tree

Hide file tree

Showing 20 changed files with 132 additions and 21 deletions.
diff --git a/genshin/models/genshin/calculator.py b/genshin/models/genshin/calculator.py
@@ -4,7 +4,13 @@
 import collections
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.model import Aliased, APIModel, Unique
 

diff --git a/genshin/models/genshin/character.py b/genshin/models/genshin/character.py
@@ -4,7 +4,13 @@
 import re
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.model import APIModel, Unique
 

diff --git a/genshin/models/genshin/chronicle/abyss.py b/genshin/models/genshin/chronicle/abyss.py
@@ -1,7 +1,13 @@
 import datetime
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.genshin import character
 from genshin.models.model import Aliased, APIModel

diff --git a/genshin/models/genshin/chronicle/activities.py b/genshin/models/genshin/chronicle/activities.py
@@ -3,8 +3,17 @@
 import re
 import typing
 
-import pydantic.v1 as pydantic
-import pydantic.v1.generics as pydantic_generics
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+    import pydantic.v1.generics as pydantic_generics
+else:
+    try:
+        import pydantic.v1 as pydantic
+        import pydantic.v1.generics as pydantic_generics
+    except ImportError:
+        import pydantic
+        import pydantic.generics as pydantic_generics
+
 
 from genshin.models.genshin import character
 from genshin.models.model import Aliased, APIModel

diff --git a/genshin/models/genshin/chronicle/characters.py b/genshin/models/genshin/chronicle/characters.py
@@ -2,7 +2,13 @@
 
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.genshin import character
 from genshin.models.model import Aliased, APIModel, Unique

diff --git a/genshin/models/genshin/chronicle/notes.py b/genshin/models/genshin/chronicle/notes.py
@@ -2,7 +2,13 @@
 import datetime
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.model import Aliased, APIModel
 

diff --git a/genshin/models/genshin/chronicle/stats.py b/genshin/models/genshin/chronicle/stats.py
@@ -3,7 +3,13 @@
 import re
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models import hoyolab
 from genshin.models.model import Aliased, APIModel

diff --git a/genshin/models/genshin/chronicle/tcg.py b/genshin/models/genshin/chronicle/tcg.py
@@ -4,7 +4,13 @@
 import enum
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.model import Aliased, APIModel, Unique
 

diff --git a/genshin/models/genshin/gacha.py b/genshin/models/genshin/gacha.py
@@ -4,7 +4,13 @@
 import re
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.model import Aliased, APIModel, Unique
 

diff --git a/genshin/models/genshin/lineup.py b/genshin/models/genshin/lineup.py
@@ -4,7 +4,13 @@
 import datetime
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.genshin import character
 from genshin.models.model import Aliased, APIModel, Unique

diff --git a/genshin/models/genshin/teapot.py b/genshin/models/genshin/teapot.py
@@ -4,7 +4,13 @@
 import datetime
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.model import Aliased, APIModel, Unique
 

diff --git a/genshin/models/genshin/wiki.py b/genshin/models/genshin/wiki.py
@@ -4,7 +4,13 @@
 import typing
 import unicodedata
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.model import Aliased, APIModel, Unique
 

diff --git a/genshin/models/honkai/battlesuit.py b/genshin/models/honkai/battlesuit.py
@@ -3,7 +3,13 @@
 import re
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.model import Aliased, APIModel, Unique
 

diff --git a/genshin/models/honkai/chronicle/battlesuits.py b/genshin/models/honkai/chronicle/battlesuits.py
@@ -2,7 +2,13 @@
 import re
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.honkai import battlesuit
 from genshin.models.model import Aliased, APIModel, Unique

diff --git a/genshin/models/honkai/chronicle/modes.py b/genshin/models/honkai/chronicle/modes.py
@@ -5,7 +5,13 @@
 import re
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models.honkai import battlesuit
 from genshin.models.model import Aliased, APIModel, Unique

diff --git a/genshin/models/honkai/chronicle/stats.py b/genshin/models/honkai/chronicle/stats.py
@@ -1,7 +1,13 @@
 """Honkai stats models."""
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin.models import hoyolab
 from genshin.models.model import Aliased, APIModel

diff --git a/genshin/models/hoyolab/record.py b/genshin/models/hoyolab/record.py
@@ -5,7 +5,13 @@
 import re
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 from genshin import types
 from genshin.models.model import Aliased, APIModel, Unique

diff --git a/genshin/models/model.py b/genshin/models/model.py
@@ -7,7 +7,13 @@
 import types
 import typing
 
-import pydantic.v1 as pydantic
+if typing.TYPE_CHECKING:
+    import pydantic.v1 as pydantic
+else:
+    try:
+        import pydantic.v1 as pydantic
+    except ImportError:
+        import pydantic
 
 import genshin.constants as genshin_constants
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 aiohttp
-pydantic==2.*
+pydantic
 
 # subdependencies
 yarl

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
     },
     packages=find_packages(exclude=["tests.*"]),
     python_requires=">=3.8",
-    install_requires=["aiohttp", "pydantic==2.*"],
+    install_requires=["aiohttp", "pydantic"],
     extras_require={
         "all": ["browser-cookie3", "rsa", "click"],
         "cookies": ["browser-cookie3"],