[backend] fix: 修复projects.py和conftest.py中的类型和导入问题
This commit is contained in:
Binary file not shown.
@@ -1,6 +1,6 @@
|
|||||||
from fastapi import APIRouter, Depends, Query
|
from fastapi import APIRouter, Depends, Query, HTTPException, status
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
from sqlalchemy import select, func, and_, desc, asc
|
from sqlalchemy import select, func, and_
|
||||||
from config.database import get_db
|
from config.database import get_db
|
||||||
from src.models.user import User
|
from src.models.user import User
|
||||||
from src.models.project import Project
|
from src.models.project import Project
|
||||||
@@ -9,7 +9,7 @@ from src.schemas.project import (
|
|||||||
ProjectUpdate,
|
ProjectUpdate,
|
||||||
ProjectResponse,
|
ProjectResponse,
|
||||||
ProjectListResponse,
|
ProjectListResponse,
|
||||||
)
|
)
|
||||||
from src.middleware.auth import (
|
from src.middleware.auth import (
|
||||||
get_current_user,
|
get_current_user,
|
||||||
require_market_or_admin,
|
require_market_or_admin,
|
||||||
@@ -10,8 +10,16 @@ from httpx import AsyncClient
|
|||||||
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
|
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
|
||||||
from sqlalchemy.pool import StaticPool
|
from sqlalchemy.pool import StaticPool
|
||||||
|
|
||||||
from main import app
|
try:
|
||||||
from config.database import Base, get_db
|
from src.main import app
|
||||||
|
except ImportError:
|
||||||
|
from main import app
|
||||||
|
|
||||||
|
try:
|
||||||
|
from src.config.database import get_db
|
||||||
|
except ImportError:
|
||||||
|
from config.database import get_db
|
||||||
|
|
||||||
from src.models.user import User
|
from src.models.user import User
|
||||||
from src.utils.password import hash_password
|
from src.utils.password import hash_password
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user