sqlalchemy MovedIn20Warning declarative_base DEPRICATION fix (#5676)

fix for the sqlalchemy deprecated declarative_base import :

```
MovedIn20Warning: The ``declarative_base()`` function is now available as sqlalchemy.orm.declarative_base(). (deprecated since: 2.0) (Background on SQLAlchemy 2.0 at: https://sqlalche.me/e/b8d9)
  Base = declarative_base()  # type: Any
```

Import is wrapped in an try catch Block to fallback to the old import if
needed.

---------

Co-authored-by: Dev 2049 <dev.dev2049@gmail.com>
This commit is contained in:
Tobias Herbold 2023-06-05 01:52:52 +02:00 committed by GitHub
parent 8d9e9e013c
commit 3fb0e4872a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions

View File

@ -3,7 +3,11 @@ import logging
from typing import List from typing import List
from sqlalchemy import Column, Integer, Text, create_engine from sqlalchemy import Column, Integer, Text, create_engine
from sqlalchemy.ext.declarative import declarative_base
try:
from sqlalchemy.orm import declarative_base
except ImportError:
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import sessionmaker
from langchain.schema import ( from langchain.schema import (

View File

@ -8,7 +8,11 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple
import sqlalchemy import sqlalchemy
from sqlalchemy import REAL, Index from sqlalchemy import REAL, Index
from sqlalchemy.dialects.postgresql import ARRAY, JSON, UUID from sqlalchemy.dialects.postgresql import ARRAY, JSON, UUID
from sqlalchemy.ext.declarative import declarative_base
try:
from sqlalchemy.orm import declarative_base
except ImportError:
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import Session, relationship from sqlalchemy.orm import Session, relationship
from sqlalchemy.sql.expression import func from sqlalchemy.sql.expression import func