Spaces:
Sleeping
Sleeping
Praneeth Yerrapragada
commited on
Commit
•
9c3303f
1
Parent(s):
81ec8d6
chore: Support for class-based `config` is deprecated, use ConfigDict instead
Browse files- app/api/routers/chat.py +5 -10
- app/model/transaction.py +1 -7
- app/schema/base.py +3 -4
app/api/routers/chat.py
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
from pydantic import BaseModel
|
2 |
from typing import List, Any, Optional, Dict, Tuple
|
3 |
from fastapi import APIRouter, Depends, HTTPException, Request, status
|
4 |
from llama_index.core.chat_engine.types import BaseChatEngine
|
@@ -19,9 +19,8 @@ class _Message(BaseModel):
|
|
19 |
|
20 |
class _ChatData(BaseModel):
|
21 |
messages: List[_Message]
|
22 |
-
|
23 |
-
|
24 |
-
json_schema_extra = {
|
25 |
"example": {
|
26 |
"messages": [
|
27 |
{
|
@@ -31,6 +30,7 @@ class _ChatData(BaseModel):
|
|
31 |
]
|
32 |
}
|
33 |
}
|
|
|
34 |
|
35 |
|
36 |
class _SourceNodes(BaseModel):
|
@@ -121,12 +121,7 @@ async def chat(
|
|
121 |
yield VercelStreamResponse.convert_data(
|
122 |
{
|
123 |
"type": "sources",
|
124 |
-
"data": {
|
125 |
-
"nodes": [
|
126 |
-
_SourceNodes.from_source_node(node).dict()
|
127 |
-
for node in response.source_nodes
|
128 |
-
]
|
129 |
-
},
|
130 |
}
|
131 |
)
|
132 |
|
|
|
1 |
+
from pydantic import BaseModel, ConfigDict
|
2 |
from typing import List, Any, Optional, Dict, Tuple
|
3 |
from fastapi import APIRouter, Depends, HTTPException, Request, status
|
4 |
from llama_index.core.chat_engine.types import BaseChatEngine
|
|
|
19 |
|
20 |
class _ChatData(BaseModel):
|
21 |
messages: List[_Message]
|
22 |
+
model_config = ConfigDict(
|
23 |
+
json_schema_extra={
|
|
|
24 |
"example": {
|
25 |
"messages": [
|
26 |
{
|
|
|
30 |
]
|
31 |
}
|
32 |
}
|
33 |
+
)
|
34 |
|
35 |
|
36 |
class _SourceNodes(BaseModel):
|
|
|
121 |
yield VercelStreamResponse.convert_data(
|
122 |
{
|
123 |
"type": "sources",
|
124 |
+
"data": {"nodes": [_SourceNodes.from_source_node(node).dict() for node in response.source_nodes]},
|
|
|
|
|
|
|
|
|
|
|
125 |
}
|
126 |
)
|
127 |
|
app/model/transaction.py
CHANGED
@@ -30,13 +30,7 @@ class Transaction(Base, BaseModel):
|
|
30 |
|
31 |
@classmethod
|
32 |
async def update(cls: "type[Transaction]", db: AsyncSession, id: int, **kwargs) -> "Transaction":
|
33 |
-
query = (
|
34 |
-
sql.update(cls)
|
35 |
-
.where(cls.id == id)
|
36 |
-
.values(**kwargs)
|
37 |
-
.execution_options(synchronize_session="fetch")
|
38 |
-
.returning(cls.id)
|
39 |
-
)
|
40 |
transactions = await db.scalars(query)
|
41 |
transaction = transactions.first()
|
42 |
await db.commit()
|
|
|
30 |
|
31 |
@classmethod
|
32 |
async def update(cls: "type[Transaction]", db: AsyncSession, id: int, **kwargs) -> "Transaction":
|
33 |
+
query = sql.update(cls).where(cls.id == id).values(**kwargs).execution_options(synchronize_session="fetch")
|
|
|
|
|
|
|
|
|
|
|
|
|
34 |
transactions = await db.scalars(query)
|
35 |
transaction = transactions.first()
|
36 |
await db.commit()
|
app/schema/base.py
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
from datetime import datetime
|
2 |
-
from pydantic import BaseModel
|
3 |
|
4 |
|
5 |
class PydanticBaseModel(BaseModel):
|
@@ -7,9 +7,8 @@ class PydanticBaseModel(BaseModel):
|
|
7 |
|
8 |
|
9 |
class BaseModel(PydanticBaseModel):
|
|
|
|
|
10 |
id: int
|
11 |
created_at: datetime
|
12 |
updated_at: datetime
|
13 |
-
|
14 |
-
class Config:
|
15 |
-
from_attributes = True
|
|
|
1 |
from datetime import datetime
|
2 |
+
from pydantic import BaseModel, ConfigDict
|
3 |
|
4 |
|
5 |
class PydanticBaseModel(BaseModel):
|
|
|
7 |
|
8 |
|
9 |
class BaseModel(PydanticBaseModel):
|
10 |
+
model_config = ConfigDict(from_attributes=True)
|
11 |
+
|
12 |
id: int
|
13 |
created_at: datetime
|
14 |
updated_at: datetime
|
|
|
|
|
|