changed name of types file to stop conflic with enum.py types

DiamondLightSource · Nov 30, 2022 · d18f008 · d18f008
1 parent 16b0baf
commit d18f008
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/diffcalc_api/__init__.py b/src/diffcalc_api/__init__.py
@@ -1,6 +1,6 @@
 """API to expose diffcalc-core methods."""
 
-from . import config, database, openapi, server, types
+from . import config, core_types, database, openapi, server
 from ._version_git import __version__
 
-__all__ = ["__version__", "server", "config", "database", "types", "openapi"]
+__all__ = ["__version__", "server", "config", "database", "core_types", "openapi"]
diff --git a/src/diffcalc_api/types.py → src/diffcalc_api/core_types.py b/src/diffcalc_api/types.py → src/diffcalc_api/core_types.py
diff --git a/src/diffcalc_api/models/response.py b/src/diffcalc_api/models/response.py
@@ -3,8 +3,8 @@
 
 from pydantic import BaseModel
 
+from diffcalc_api.core_types import Orientation, Reflection
 from diffcalc_api.models.ub import HklModel, MiscutModel, SphericalCoordinates, XyzModel
-from diffcalc_api.types import Orientation, Reflection
 
 
 class InfoResponse(BaseModel):

diff --git a/src/diffcalc_api/routes/ub.py b/src/diffcalc_api/routes/ub.py
@@ -4,6 +4,7 @@
 
 from fastapi import APIRouter, Body, Depends, Query
 
+from diffcalc_api.core_types import Orientation, Position, Reflection
 from diffcalc_api.errors.ub import (
     BothTagAndIdxProvidedError,
     InvalidSetLatticeParamsError,
@@ -35,7 +36,6 @@
 )
 from diffcalc_api.services import ub as service
 from diffcalc_api.stores.protocol import HklCalcStore, get_store
-from diffcalc_api.types import Orientation, Position, Reflection
 
 router = APIRouter(prefix="/ub", tags=["ub"])