Merge pull request #64 from PrefectHQ/pydantic-v2-compatibility

Conditional imports to support operating with `pydantic>2` installed

Author: chrisguidry

prefect_sqlalchemy/credentials.py

@@ -5,7 +5,13 @@
 from typing import Any, Dict, Optional, Union
 
 from prefect.blocks.core import Block
-from pydantic import AnyUrl, BaseModel, Field, SecretStr
+from pydantic import VERSION as PYDANTIC_VERSION
+
+if PYDANTIC_VERSION.startswith("2."):
+    from pydantic.v1 import AnyUrl, BaseModel, Field, SecretStr
+else:
+    from pydantic import AnyUrl, BaseModel, Field, SecretStr
+
 from sqlalchemy.engine import Connection, create_engine
 from sqlalchemy.engine.url import URL, make_url
 from sqlalchemy.ext.asyncio import AsyncConnection, create_async_engine

prefect_sqlalchemy/database.py

@@ -9,7 +9,13 @@
 from prefect.blocks.abstract import CredentialsBlock, DatabaseBlock
 from prefect.utilities.asyncutils import sync_compatible
 from prefect.utilities.hashing import hash_objects
-from pydantic import AnyUrl, Field, SecretStr
+from pydantic import VERSION as PYDANTIC_VERSION
+
+if PYDANTIC_VERSION.startswith("2."):
+    from pydantic.v1 import AnyUrl, Field, SecretStr
+else:
+    from pydantic import AnyUrl, Field, SecretStr
+
 from sqlalchemy.engine import Connection, Engine, create_engine
 from sqlalchemy.engine.cursor import CursorResult
 from sqlalchemy.engine.url import URL, make_url

requirements.txt

@@ -1,2 +1,2 @@
 prefect>=2.7.0
-sqlalchemy>=1.4.31
+sqlalchemy>=1.4.31,<2