From 01370c7a9e70559c37c41817dbc0ee84bb150258 Mon Sep 17 00:00:00 2001 From: c8y3 <25362953+c8y3@users.noreply.github.com> Date: Fri, 24 Jan 2025 09:17:23 +0100 Subject: [PATCH] [CLEAN] Prefer direct imports --- source/app/blueprints/rest/case/case_assets_routes.py | 2 +- source/app/datamgmt/manage/manage_case_objs.py | 5 ++++- source/app/datamgmt/manage/manage_evidence_types_db.py | 3 ++- source/app/iris_engine/utils/tracker.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/app/blueprints/rest/case/case_assets_routes.py b/source/app/blueprints/rest/case/case_assets_routes.py index 393fbcc6c..913f680fb 100644 --- a/source/app/blueprints/rest/case/case_assets_routes.py +++ b/source/app/blueprints/rest/case/case_assets_routes.py @@ -51,7 +51,7 @@ from app.iris_engine.access_control.utils import ac_fast_check_current_user_has_case_access from app.iris_engine.module_handler.module_handler import call_modules_hook from app.iris_engine.utils.tracker import track_activity -from app.models import AnalysisStatus +from app.models.models import AnalysisStatus from app.models.authorization import CaseAccessLevel from app.schema.marshables import CaseAssetsSchema from app.schema.marshables import CommentSchema diff --git a/source/app/datamgmt/manage/manage_case_objs.py b/source/app/datamgmt/manage/manage_case_objs.py index 014d77658..8ed653fcc 100644 --- a/source/app/datamgmt/manage/manage_case_objs.py +++ b/source/app/datamgmt/manage/manage_case_objs.py @@ -17,7 +17,10 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. from sqlalchemy import func -from app.models import AnalysisStatus, IocType, AssetsType, EventCategory +from app.models.models import AnalysisStatus +from app.models.models import IocType +from app.models.models import AssetsType +from app.models.models import EventCategory def search_analysis_status_by_name(name: str, exact_match: bool = False) -> AnalysisStatus: diff --git a/source/app/datamgmt/manage/manage_evidence_types_db.py b/source/app/datamgmt/manage/manage_evidence_types_db.py index 2184d9f1f..33c2b11a1 100644 --- a/source/app/datamgmt/manage/manage_evidence_types_db.py +++ b/source/app/datamgmt/manage/manage_evidence_types_db.py @@ -17,7 +17,8 @@ from sqlalchemy import func from typing import List -from app.models import EvidenceTypes, CaseReceivedFile +from app.models.models import EvidenceTypes +from app.models.models import CaseReceivedFile def get_evidence_types_list() -> List[dict]: diff --git a/source/app/iris_engine/utils/tracker.py b/source/app/iris_engine/utils/tracker.py index 59e086caf..183067626 100644 --- a/source/app/iris_engine/utils/tracker.py +++ b/source/app/iris_engine/utils/tracker.py @@ -23,7 +23,7 @@ import app from app import db -from app.models import UserActivity +from app.models.models import UserActivity log = app.app.logger