Compare commits

...

5 Commits
main ... dev

@ -190,6 +190,7 @@ def create_items(
), ),
) )
try:
# construct a list of schemas.Item items # construct a list of schemas.Item items
spreadsheet_item_list = [ spreadsheet_item_list = [
schemas.ItemCreate( schemas.ItemCreate(
@ -201,7 +202,6 @@ def create_items(
for row in sheet["data"] for row in sheet["data"]
] ]
# dump all the data into database # dump all the data into database
try:
accepted, processed = crud.insert_items(db=db, items=spreadsheet_item_list) accepted, processed = crud.insert_items(db=db, items=spreadsheet_item_list)
except Exception as e: except Exception as e:
raise HTTPException( raise HTTPException(

@ -1,17 +1,18 @@
alembic==1.8.0 alembic==1.8.0
anyio==3.5.0 anyio==3.7.1
et-xmlfile==1.1.0 et-xmlfile==1.1.0
fastapi==0.74.1 fastapi==0.105.0
greenlet==1.1.2 greenlet==1.1.2
idna==3.3 idna==3.3
openpyxl==3.0.9 openpyxl==3.0.9
passlib[bcrypt]==1.7.4 passlib[bcrypt]==1.7.4
psycopg2==2.9.3 psycopg2==2.9.3
pydantic==1.9.0 pydantic==2.5.2
python-jose[cryptography]==3.3.0 python-jose[cryptography]==3.3.0
python-multipart==0.0.5 python-multipart==0.0.5
six==1.16.0 six==1.16.0
sniffio==1.2.0 sniffio==1.2.0
SQLAlchemy==1.4.31 SQLAlchemy==1.4.31
starlette==0.17.1 starlette==0.27.0
typing_extensions==4.1.1 typing_extensions==4.8.0

@ -1,7 +1,7 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from typing import Optional, Union from typing import Optional, Union
from pydantic import BaseModel from pydantic import BaseModel, ConfigDict
# Security # Security
@ -51,6 +51,8 @@ class ItemBase(BaseModel):
по результатам экспедиционных исследований по результатам экспедиционных исследований
""" """
model_config = ConfigDict(coerce_numbers_to_str=True)
fadr: Optional[str] = None fadr: Optional[str] = None
internal_id: Optional[str] = None internal_id: Optional[str] = None
x_coord: Optional[str] = None x_coord: Optional[str] = None
@ -87,7 +89,7 @@ class Item(ItemBase):
depth_max: Optional[float] = None depth_max: Optional[float] = None
class Config: class Config:
orm_mode = True from_attributes = True
class InsertStatus(BaseModel): class InsertStatus(BaseModel):

Loading…
Cancel
Save