Refactor import statements and enhance project structure

- Updated import paths across multiple files to utilize the new `omni_shared` and `omni_utils` modules, improving code organization and clarity.
- Replaced relative imports with absolute paths for better maintainability.
- Consolidated imports from `omni_utils.decorators` to streamline decorator usage throughout the codebase.
- Enhanced the `load_schema` function in `queries.py` to use a base directory path for schema file references, improving path management.

backend/api/src/domain/account_managers.py

@@ -6,7 +6,7 @@
 
 from omni_models.analytics.forecast import compute_forecast
 from omni_models.domain import WorkerKind
-import globals
+from omni_shared import globals
 
 
 def resolve_account_managers(_, info):

backend/api/src/domain/consultants_engineers.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from datasets.timesheets import compute_timesheet
-from omni_models.domain.cases import compute_cases
+from domain.cases import compute_cases
 from utils.fields import build_fields_map
 from omni_models.analytics.timeliness_review import compute_timeliness_review
 from omni_models.domain import WorkerKind

backend/api/src/queries.py

@@ -6,13 +6,16 @@
 from analytics import setup_query_for_analytics
 from inconsistencies import resolve_inconsistencies
 
+
+BASE_DIR = Path(__file__).parent
+
 def load_schema():
     schema_files = [
-        "api/schema/common.graphql",
-        "api/domain/schema.graphql", 
-        "api/datasets/schema.graphql",
-        "api/analytics/schema.graphql",
-        "api/schema.graphql",
+        BASE_DIR / "schema/common.graphql",
+        BASE_DIR / "domain/schema.graphql", 
+        BASE_DIR / "datasets/schema.graphql",
+        BASE_DIR / "analytics/schema.graphql",
+        BASE_DIR / "schema.graphql",
     ]
     schemas = []
     for file in schema_files:

backend/models/src/omni_models/analytics/forecast.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 import calendar
 
-from models.analytics.revenue_tracking import compute_revenue_tracking
+from omni_models.analytics.revenue_tracking import compute_revenue_tracking
 
 def get_same_day_one_month_ago(date_of_interest):
     d = date_of_interest.day

backend/models/src/omni_models/base/powerdataframe.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import numpy as np
 from datetime import datetime
-from models.helpers.weeks import Weeks
+from omni_utils.helpers.weeks import Weeks
 
 
 class PowerDataFrame:

backend/models/src/omni_models/datasets/tasks_dataset.py

@@ -3,7 +3,7 @@
 
 import pandas as pd
 
-from omni_utils.decorators import cache
+from omni_utils.decorators.cache import cache
 from omni_models.base.powerdataframe import SummarizablePowerDataFrame
 from omni_models.datasets.omni_dataset import OmniDataset
 from omni_models.omnimodels import OmniModels

backend/models/src/omni_models/datasets/timesheet_dataset.py

@@ -5,7 +5,7 @@
 import pandas as pd
 import numpy as np
 
-from omni_utils.decorators import cache
+from omni_utils.decorators.cache import cache
 from omni_models.base.powerdataframe import SummarizablePowerDataFrame
 from omni_models.datasets.omni_dataset import OmniDataset
 from omni_utils.helpers.weeks import Weeks

backend/models/src/omni_models/domain/offers.py

@@ -1,8 +1,8 @@
 from typing import Optional, Dict
 from pydantic import BaseModel
 
-import models.helpers.slug as slug
-from models.semantic import Ontology
+import omni_utils.helpers.slug as slug
+from omni_models.semantic import Ontology
 
 class Offer(BaseModel):
     id: int

backend/models/src/omni_models/omnimodels.py

@@ -11,7 +11,7 @@
 from omni_models.base.powerdataframe import SummarizablePowerDataFrame
 
 from omni_utils.helpers.weeks import Weeks
-from omni_utils.decorators import cache
+from omni_utils.decorators.cache import cache
 
 from datetime import datetime
 import pandas as pd

backend/models/src/omni_models/semantic/__init__.py

@@ -1,24 +1,24 @@
-from models.semantic.insights import (
+from omni_models.semantic.insights import (
     Insight, Insights,
 )
 
-from models.semantic.ontology import (
+from omni_models.semantic.ontology import (
     Case, Class, Client, Entry, Ontology, Worker, WorkerPost,
 )
 
-from models.semantic.salesfunnel import (
+from omni_models.semantic.salesfunnel import (
     AccountManager, Activity, Deal, SalesFunnelB2B, Stage,
 )
 
-from models.semantic.tasksmanager import (
+from omni_models.semantic.tasksmanager import (
     Project, ProjectsDataFrame, Task, TasksManager,
 )
 
-from models.semantic.timetracker import (
+from omni_models.semantic.timetracker import (
     Appointment, AppointmentsDataFrame, Project, TimeTracker,
 )
 
-from models.semantic.crm import (
+from omni_models.semantic.crm import (
     CRM, Person
 )
 

backend/models/src/omni_models/semantic/crm.py

@@ -6,7 +6,7 @@
 
 from omni_shared.settings import api_settings
 
-from omni_utils.decorators import c4_external_system
+from omni_utils.decorators.c4 import c4_external_system
 
 
 class Person(BaseModel):

backend/models/src/omni_models/semantic/insights.py

@@ -6,7 +6,7 @@
 from omni_models.base.semanticmodel import SemanticModel
 from omni_models.syntactic import Wordpress, User, Post
 
-from omni_utils.decorators import c4_external_system
+from omni_utils.decorators.c4 import c4_external_system
 
 
 class Insight(BaseModel):

backend/models/src/omni_models/semantic/ontology.py

@@ -11,7 +11,7 @@
 from omni_models.base.semanticmodel import SemanticModel
 from omni_models.syntactic import Wordpress, Post, User, EventDetail
 
-from omni_utils.decorators import c4_external_system
+from omni_utils.decorators.c4 import c4_external_system
 
 
 class Class(BaseModel):

backend/models/src/omni_models/semantic/salesfunnel.py

@@ -9,7 +9,7 @@
 from omni_utils.helpers.weeks import Weeks
 import omni_utils.helpers.slug as slug
 
-from omni_utils.decorators import c4_external_system
+from omni_utils.decorators.c4 import c4_external_system
 from omni_shared.settings import api_settings
 
 

backend/models/src/omni_models/semantic/tasksmanager.py

@@ -3,7 +3,7 @@
 from omni_models.base.semanticmodel import SemanticModel
 from omni_models.syntactic import Todoist
 from omni_models.base.powerdataframe import PowerDataFrame
-from omni_utils.decorators import c4_external_system
+from omni_utils.decorators.c4 import c4_external_system
 
 import omni_models.syntactic.todoist as t
 

backend/models/src/omni_models/semantic/timetracker.py

@@ -11,7 +11,7 @@
 from omni_models.syntactic import Everhour, User, Client
 import omni_models.syntactic.everhour as e
 
-from omni_utils.decorators import c4_external_system
+from omni_utils.decorators.c4 import c4_external_system
 from omni_shared.settings import api_settings
 
 import pytz

backend/models/src/omni_models/syntactic/everhour.py

@@ -7,7 +7,7 @@
 
 import pytz
 
-from omni_utils.decorators import cache
+from omni_utils.decorators.cache import cache
 import omni_utils.helpers.slug as slug
 
 

backend/models/src/omni_models/syntactic/pipedrive.py

@@ -1,6 +1,6 @@
 from datetime import datetime, date
 from typing import Optional, List, Dict
-from omni_utils.decorators import cache
+from omni_utils.decorators.cache import cache
 
 import requests
 from pydantic import BaseModel, validator, HttpUrl

backend/models/src/omni_models/syntactic/todoist.py

@@ -2,7 +2,7 @@
 from pydantic import BaseModel
 from typing import List, Optional
 
-from omni_utils.decorators import cache
+from omni_utils.decorators.cache import cache
 import omni_utils.helpers.slug as slug
 
 

backend/models/src/omni_models/syntactic/wordpress.py

@@ -8,7 +8,7 @@
 from enum import Enum
 
 from omni_utils.helpers.weeks import Weeks
-from omni_utils.decorators import cache
+from omni_utils.decorators.cache import cache
 
 import logging