Removed wildcard import from app.models __init__

source/app/blueprints/pages/case/case_routes.py

@@ -32,7 +32,7 @@
 from app.forms import PipelinesCaseForm
 from app.iris_engine.access_control.utils import ac_get_all_access_level
 from app.iris_engine.module_handler.module_handler import list_available_pipelines
-from app.models import CaseStatus
+from app.models.models import CaseStatus
 from app.models.authorization import CaseAccessLevel
 from app.blueprints.access_controls import ac_case_requires
 

source/app/blueprints/pages/manage/manage_case_templates_routes.py

@@ -22,7 +22,7 @@
 
 from app.datamgmt.manage.manage_case_templates_db import get_case_template_by_id
 from app.forms import CaseTemplateForm, AddAssetForm
-from app.models import CaseTemplate
+from app.models.models import CaseTemplate
 from app.models.authorization import Permissions
 from app.blueprints.access_controls import ac_requires
 from app.blueprints.responses import response_error

source/app/blueprints/pages/manage/manage_ioc_types_routes.py

@@ -22,7 +22,7 @@
 from werkzeug.utils import redirect
 
 from app.forms import AddIocTypeForm
-from app.models import IocType
+from app.models.models import IocType
 from app.models.authorization import Permissions
 from app.blueprints.access_controls import ac_requires
 from app.blueprints.responses import response_error

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

source/app/blueprints/rest/case/case_notes_routes.py

@@ -46,7 +46,7 @@
 from app.datamgmt.states import get_notes_state
 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 Notes
+from app.models.models import Notes
 from app.models.authorization import CaseAccessLevel
 from app.schema.marshables import CaseNoteDirectorySchema
 from app.schema.marshables import CaseNoteRevisionSchema

source/app/blueprints/rest/case/case_routes.py

@@ -43,9 +43,9 @@
 from app.iris_engine.access_control.utils import ac_fast_check_user_has_case_access
 from app.iris_engine.access_control.utils import ac_set_case_access_for_users
 from app.iris_engine.utils.tracker import track_activity
-from app.models import CaseStatus
-from app.models import ReviewStatusList
-from app.models import UserActivity
+from app.models.models import CaseStatus
+from app.models.models import ReviewStatusList
+from app.models.models import UserActivity
 from app.models.authorization import CaseAccessLevel
 from app.models.authorization import User
 from app.schema.marshables import TaskLogSchema

source/app/blueprints/rest/case/case_timeline_routes.py

@@ -54,7 +54,7 @@
 from app.iris_engine.utils.collab import collab_notify
 from app.iris_engine.utils.common import parse_bf_date_format
 from app.iris_engine.utils.tracker import track_activity
-from app.models import CompromiseStatus
+from app.models.models import CompromiseStatus
 from app.models.authorization import CaseAccessLevel
 from app.models.authorization import User
 from app.models.cases.cases import CasesEvent

source/app/blueprints/rest/dim_tasks_routes.py

@@ -23,18 +23,18 @@
 from sqlalchemy import desc
 
 from app.iris_engine.module_handler.module_handler import call_modules_hook
-from app.models import CeleryTaskMeta
-from app.models import IrisHook
-from app.models import IrisModule
-from app.models import IrisModuleHook
-from app.models import CaseAssets
-from app.models import CaseReceivedFile
-from app.models import CaseTasks
+from app.models.models import CeleryTaskMeta
+from app.models.models import IrisHook
+from app.models.models import IrisModule
+from app.models.models import IrisModuleHook
+from app.models.models import CaseAssets
+from app.models.models import CaseReceivedFile
+from app.models.models import CaseTasks
 from app.models.cases import Cases
 from app.models.cases import CasesEvent
-from app.models import GlobalTasks
-from app.models import Ioc
-from app.models import Notes
+from app.models.models import GlobalTasks
+from app.models.models import Ioc
+from app.models.models import Notes
 from app.models.alerts import Alert
 from app.models.authorization import CaseAccessLevel
 from app.blueprints.access_controls import ac_requires_case_identifier

source/app/blueprints/rest/manage/manage_case_templates_routes.py

@@ -27,7 +27,7 @@
 from app.datamgmt.manage.manage_case_templates_db import get_case_template_by_id
 from app.datamgmt.manage.manage_case_templates_db import validate_case_template
 from app.datamgmt.manage.manage_case_templates_db import delete_case_template_by_id
-from app.models import CaseTemplate
+from app.models.models import CaseTemplate
 from app.models.authorization import Permissions
 from app.iris_engine.utils.tracker import track_activity
 from app.schema.marshables import CaseTemplateSchema

source/app/blueprints/rest/manage/manage_ioc_types_routes.py

@@ -24,8 +24,8 @@
 from app.datamgmt.case.case_iocs_db import get_ioc_types_list
 from app.datamgmt.manage.manage_case_objs import search_ioc_type_by_name
 from app.iris_engine.utils.tracker import track_activity
-from app.models import Ioc
-from app.models import IocType
+from app.models.models import Ioc
+from app.models.models import IocType
 from app.models.authorization import Permissions
 from app.schema.marshables import IocTypeSchema
 from app.blueprints.access_controls import ac_api_requires

source/app/blueprints/rest/manage/manage_tlps_routes.py

@@ -18,7 +18,7 @@
 
 from flask import Blueprint
 
-from app.models import Tlp
+from app.models.models import Tlp
 from app.blueprints.access_controls import ac_api_requires
 from app.blueprints.responses import response_error
 from app.blueprints.responses import response_success

source/app/blueprints/rest/reports_route.py

@@ -29,7 +29,7 @@
 from app.iris_engine.reporter.reporter import IrisMakeMdReport
 from app.iris_engine.utils.tracker import track_activity
 
-from app.models import CaseTemplateReport
+from app.models.models import CaseTemplateReport
 from app.models.authorization import CaseAccessLevel
 
 from app.util import FileRemover

source/app/blueprints/rest/search_routes.py

@@ -21,7 +21,7 @@
 from sqlalchemy import and_
 
 from app.iris_engine.utils.tracker import track_activity
-from app.models import Comments
+from app.models.models import Comments
 from app.models.authorization import Permissions
 from app.models.cases import Cases
 from app.models.models import Client

source/app/business/assets.py

@@ -21,7 +21,7 @@
 
 from app.business.errors import BusinessProcessingError
 from app.business.errors import ObjectNotFoundError
-from app.models import CaseAssets
+from app.models.models import CaseAssets
 from app.datamgmt.case.case_assets_db import get_asset
 from app.datamgmt.case.case_assets_db import case_assets_db_exists
 from app.datamgmt.case.case_assets_db import create_asset

source/app/business/cases.py

@@ -30,7 +30,7 @@
 from app.util import add_obj_history_entry
 from app.schema.marshables import CaseSchema
 
-from app.models import ReviewStatusList
+from app.models.models import ReviewStatusList
 
 from app.business.errors import BusinessProcessingError
 from app.business.iocs import iocs_exports_to_json

source/app/business/iocs.py

@@ -20,7 +20,7 @@
 from marshmallow.exceptions import ValidationError
 
 from app import db
-from app.models import Ioc
+from app.models.models import Ioc
 from app.datamgmt.case.case_iocs_db import add_ioc
 from app.datamgmt.case.case_iocs_db import case_iocs_db_exists
 from app.datamgmt.case.case_iocs_db import check_ioc_type_id

source/app/business/notes.py

@@ -25,7 +25,7 @@
 from app.datamgmt.case.case_notes_db import get_note
 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 NoteRevisions
+from app.models.models import NoteRevisions
 from app.models.authorization import User
 from app.schema.marshables import CaseNoteSchema
 from app.util import add_obj_history_entry

source/app/business/tasks.py

@@ -29,7 +29,7 @@
 from app.datamgmt.states import update_tasks_state
 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 CaseTasks
+from app.models.models import CaseTasks
 from app.schema.marshables import CaseTaskSchema
 from app.business.errors import BusinessProcessingError
 from app.business.errors import ObjectNotFoundError

source/app/datamgmt/alerts/alerts_db.py

@@ -49,14 +49,14 @@
 from app.datamgmt.manage.manage_case_templates_db import case_template_post_modifier
 from app.datamgmt.states import update_timeline_state
 from app.models.cases import Cases
-from app.models import EventCategory
-from app.models import Tags
-from app.models import AssetsType
-from app.models import Comments
-from app.models import CaseAssets
-from app.models import alert_assets_association
-from app.models import alert_iocs_association
-from app.models import Ioc
+from app.models.models import EventCategory
+from app.models.models import Tags
+from app.models.models import AssetsType
+from app.models.models import Comments
+from app.models.models import CaseAssets
+from app.models.models import alert_assets_association
+from app.models.models import alert_iocs_association
+from app.models.models import Ioc
 from app.models.alerts import Alert
 from app.models.alerts import AlertStatus
 from app.models.alerts import AlertCaseAssociation

source/app/datamgmt/case/case_assets_db.py

@@ -24,18 +24,18 @@
 
 from app import db, app
 from app.datamgmt.states import update_assets_state
-from app.models import AnalysisStatus
-from app.models import CaseStatus
-from app.models import AssetComments
-from app.models import AssetsType
-from app.models import CaseAssets
-from app.models import CaseEventsAssets
+from app.models.models import AnalysisStatus
+from app.models.models import CaseStatus
+from app.models.models import AssetComments
+from app.models.models import AssetsType
+from app.models.models import CaseAssets
+from app.models.models import CaseEventsAssets
 from app.models.cases import Cases
-from app.models import Comments
-from app.models import CompromiseStatus
-from app.models import Ioc
-from app.models import IocAssetLink
-from app.models import IocType
+from app.models.models import Comments
+from app.models.models import CompromiseStatus
+from app.models.models import Ioc
+from app.models.models import IocAssetLink
+from app.models.models import IocType
 from app.models.authorization import User
 
 

source/app/datamgmt/case/case_comments.py

@@ -16,7 +16,7 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from app.models import Comments
+from app.models.models import Comments
 
 
 def get_case_comment(comment_id, caseid):

source/app/datamgmt/case/case_events_db.py

@@ -20,18 +20,18 @@
 
 from app import db
 from app.datamgmt.states import update_timeline_state
-from app.models import AssetsType
-from app.models import CaseAssets
-from app.models import CaseEventCategory
-from app.models import CaseEventsAssets
-from app.models import CaseEventsIoc
+from app.models.models import AssetsType
+from app.models.models import CaseAssets
+from app.models.models import CaseEventCategory
+from app.models.models import CaseEventsAssets
+from app.models.models import CaseEventsIoc
 from app.models.cases import CasesEvent
-from app.models import Comments
-from app.models import EventCategory
-from app.models import EventComments
-from app.models import Ioc
-from app.models import IocAssetLink
-from app.models import IocType
+from app.models.models import Comments
+from app.models.models import EventCategory
+from app.models.models import EventComments
+from app.models.models import Ioc
+from app.models.models import IocAssetLink
+from app.models.models import IocType
 from app.models.authorization import User
 
 

source/app/datamgmt/case/case_iocs_db.py

@@ -27,11 +27,11 @@
 from app.iris_engine.access_control.utils import ac_get_fast_user_cases_access
 from app.models.cases import Cases
 from app.models.models import Client
-from app.models import Comments
-from app.models import Ioc
-from app.models import IocComments
-from app.models import IocType
-from app.models import Tlp
+from app.models.models import Comments
+from app.models.models import Ioc
+from app.models.models import IocComments
+from app.models.models import IocType
+from app.models.models import Tlp
 from app.models.authorization import User
 from app.models.authorization import UserCaseEffectiveAccess
 from app.models.authorization import CaseAccessLevel

source/app/datamgmt/case/case_notes_db.py

@@ -21,11 +21,13 @@
 from app import db
 from app.datamgmt.manage.manage_attribute_db import get_default_custom_attributes
 from app.datamgmt.states import update_notes_state
-from app.models import Comments, NoteDirectory, NoteRevisions
-from app.models import Notes
-from app.models import NotesComments
-from app.models import NotesGroup
-from app.models import NotesGroupLink
+from app.models.models import Comments
+from app.models.models import NoteDirectory
+from app.models.models import NoteRevisions
+from app.models.models import Notes
+from app.models.models import NotesComments
+from app.models.models import NotesGroup
+from app.models.models import NotesGroupLink
 from app.models.authorization import User
 
 

source/app/datamgmt/case/case_rfiles_db.py

@@ -24,9 +24,9 @@
 from app import db
 from app.datamgmt.manage.manage_attribute_db import get_default_custom_attributes
 from app.datamgmt.states import update_evidences_state
-from app.models import CaseReceivedFile
-from app.models import Comments
-from app.models import EvidencesComments
+from app.models.models import CaseReceivedFile
+from app.models.models import Comments
+from app.models.models import EvidencesComments
 from app.models.authorization import User
 
 

source/app/datamgmt/case/case_tasks_db.py

@@ -25,12 +25,12 @@
 from app.datamgmt.manage.manage_attribute_db import get_default_custom_attributes
 from app.datamgmt.manage.manage_users_db import get_users_list_restricted_from_case
 from app.datamgmt.states import update_tasks_state
-from app.models import CaseTasks
-from app.models import TaskAssignee
+from app.models.models import CaseTasks
+from app.models.models import TaskAssignee
 from app.models.cases import Cases
-from app.models import Comments
-from app.models import TaskComments
-from app.models import TaskStatus
+from app.models.models import Comments
+from app.models.models import TaskComments
+from app.models.models import TaskStatus
 from app.models.authorization import User
 
 

source/app/datamgmt/client/client_db.py

@@ -25,7 +25,7 @@
 from app.datamgmt.exceptions.ElementExceptions import ElementNotFoundException
 from app.models.cases import Cases
 from app.models.models import Client
-from app.models import Contact
+from app.models.models import Contact
 from app.models.authorization import User
 from app.models.authorization import UserClient
 from app.schema.marshables import ContactSchema

source/app/datamgmt/dashboard/dashboard_db.py

@@ -20,12 +20,12 @@
 from sqlalchemy import desc
 
 from app import db
-from app.models import CaseTasks
-from app.models import TaskAssignee
-from app.models import ReviewStatus
+from app.models.models import CaseTasks
+from app.models.models import TaskAssignee
+from app.models.models import ReviewStatus
 from app.models.cases import Cases
-from app.models import GlobalTasks
-from app.models import TaskStatus
+from app.models.models import GlobalTasks
+from app.models.models import TaskStatus
 from app.models.authorization import User
 
 

source/app/datamgmt/datastore/datastore_db.py

@@ -27,12 +27,12 @@
 
 from app import app
 from app import db
-from app.models import CaseReceivedFile
-from app.models import DataStoreFile
-from app.models import DataStorePath
-from app.models import Ioc
-from app.models import IocType
-from app.models import Tlp
+from app.models.models import CaseReceivedFile
+from app.models.models import DataStoreFile
+from app.models.models import DataStorePath
+from app.models.models import Ioc
+from app.models.models import IocType
+from app.models.models import Tlp
 
 
 def datastore_get_root(cid):