Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions backend/analytics_server/app.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
from flask import Flask

from dora.store import configure_db_with_app
from mhq.store import configure_db_with_app
from env import load_app_env

load_app_env()

from dora.api.hello import app as core_api
from dora.api.settings import app as settings_api
from dora.api.pull_requests import app as pull_requests_api
from dora.api.incidents import app as incidents_api
from dora.api.integrations import app as integrations_api
from dora.api.deployment_analytics import app as deployment_analytics_api
from dora.api.teams import app as teams_api
from dora.api.sync import app as sync_api
from mhq.api.hello import app as core_api
from mhq.api.settings import app as settings_api
from mhq.api.pull_requests import app as pull_requests_api
from mhq.api.incidents import app as incidents_api
from mhq.api.integrations import app as integrations_api
from mhq.api.deployment_analytics import app as deployment_analytics_api
from mhq.api.teams import app as teams_api
from mhq.api.sync import app as sync_api

from dora.store.initialise_db import initialize_database
from mhq.store.initialise_db import initialize_database

app = Flask(__name__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@

from flask import Blueprint
from voluptuous import Required, Schema, Coerce, All, Optional
from dora.api.resources.code_resouces import get_non_paginated_pr_response
from dora.service.deployments.deployments_factory_service import (
from mhq.api.resources.code_resouces import get_non_paginated_pr_response
from mhq.service.deployments.deployments_factory_service import (
DeploymentsFactoryService,
)
from dora.service.deployments.factory import get_deployments_factory
from dora.service.pr_analytics import get_pr_analytics_service
from dora.service.code.pr_filter import apply_pr_filter
from mhq.service.deployments.factory import get_deployments_factory
from mhq.service.pr_analytics import get_pr_analytics_service
from mhq.service.code.pr_filter import apply_pr_filter

from dora.api.request_utils import coerce_workflow_filter, queryschema
from dora.api.resources.deployment_resources import (
from mhq.api.request_utils import coerce_workflow_filter, queryschema
from mhq.api.resources.deployment_resources import (
adapt_deployment,
adapt_deployment_frequency_metrics,
)
from dora.service.deployments.analytics import get_deployment_analytics_service
from dora.service.query_validator import get_query_validator
from dora.store.models import SettingType, EntityType, Team
from dora.store.models.code.filter import PRFilter
from dora.store.models.code.pull_requests import PullRequest
from dora.store.models.code.repository import OrgRepo, TeamRepos
from dora.store.models.code.workflows.filter import WorkflowFilter
from dora.service.deployments.models.models import (
from mhq.service.deployments.analytics import get_deployment_analytics_service
from mhq.service.query_validator import get_query_validator
from mhq.store.models import SettingType, EntityType, Team
from mhq.store.models.code.filter import PRFilter
from mhq.store.models.code.pull_requests import PullRequest
from mhq.store.models.code.repository import OrgRepo, TeamRepos
from mhq.store.models.code.workflows.filter import WorkflowFilter
from mhq.service.deployments.models.models import (
Deployment,
DeploymentFrequencyMetrics,
DeploymentType,
)
from dora.store.repos.code import CodeRepoService
from mhq.store.repos.code import CodeRepoService


app = Blueprint("deployment_analytics", __name__)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@

from flask import Blueprint
from voluptuous import Required, Schema, Coerce, All, Optional
from dora.service.code.pr_filter import apply_pr_filter
from dora.store.models.code.filter import PRFilter
from dora.store.models.settings import SettingType, EntityType
from dora.service.incidents.models.mean_time_to_recovery import ChangeFailureRateMetrics
from dora.service.deployments.deployment_service import (
from mhq.service.code.pr_filter import apply_pr_filter
from mhq.store.models.code.filter import PRFilter
from mhq.store.models.settings import SettingType, EntityType
from mhq.service.incidents.models.mean_time_to_recovery import ChangeFailureRateMetrics
from mhq.service.deployments.deployment_service import (
get_deployments_service,
)
from dora.service.deployments.models.models import Deployment
from dora.store.models.code.workflows.filter import WorkflowFilter
from dora.utils.time import Interval
from dora.service.incidents.incidents import get_incident_service
from dora.api.resources.incident_resources import (
from mhq.service.deployments.models.models import Deployment
from mhq.store.models.code.workflows.filter import WorkflowFilter
from mhq.utils.time import Interval
from mhq.service.incidents.incidents import get_incident_service
from mhq.api.resources.incident_resources import (
adapt_change_failure_rate,
adapt_deployments_with_related_incidents,
adapt_incident,
adapt_mean_time_to_recovery_metrics,
)
from dora.store.models.incidents import Incident
from mhq.store.models.incidents import Incident

from dora.api.request_utils import coerce_workflow_filter, queryschema
from dora.service.query_validator import get_query_validator
from mhq.api.request_utils import coerce_workflow_filter, queryschema
from mhq.service.query_validator import get_query_validator

app = Blueprint("incidents", __name__)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from flask import Blueprint
from voluptuous import Schema, Optional, Coerce, Range, All, Required

from dora.api.request_utils import queryschema
from dora.service.external_integrations_service import get_external_integrations_service
from dora.service.query_validator import get_query_validator
from dora.store.models import UserIdentityProvider
from dora.utils.github import github_org_data_multi_thread_worker
from mhq.api.request_utils import queryschema
from mhq.service.external_integrations_service import get_external_integrations_service
from mhq.service.query_validator import get_query_validator
from mhq.store.models import UserIdentityProvider
from mhq.utils.github import github_org_data_multi_thread_worker

app = Blueprint("integrations", __name__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
from typing import Dict, List

from voluptuous import Required, Schema, Coerce, All, Optional
from dora.service.code.models.lead_time import LeadTimeMetrics
from dora.service.code.lead_time import get_lead_time_service
from dora.service.code.pr_filter import apply_pr_filter
from mhq.service.code.models.lead_time import LeadTimeMetrics
from mhq.service.code.lead_time import get_lead_time_service
from mhq.service.code.pr_filter import apply_pr_filter

from dora.store.models.code import PRFilter
from dora.store.models.core import Team
from dora.service.query_validator import get_query_validator
from mhq.store.models.code import PRFilter
from mhq.store.models.core import Team
from mhq.service.query_validator import get_query_validator

from dora.api.request_utils import queryschema
from dora.api.resources.code_resouces import (
from mhq.api.request_utils import queryschema
from mhq.api.resources.code_resouces import (
adapt_lead_time_metrics,
adapt_pull_request,
get_non_paginated_pr_response,
)
from dora.store.models.code.pull_requests import PullRequest
from dora.service.pr_analytics import get_pr_analytics_service
from dora.service.settings.models import ExcludedPRsSetting
from mhq.store.models.code.pull_requests import PullRequest
from mhq.service.pr_analytics import get_pr_analytics_service
from mhq.service.settings.models import ExcludedPRsSetting

from dora.utils.time import Interval
from mhq.utils.time import Interval


from dora.service.settings.configuration_settings import get_settings_service
from mhq.service.settings.configuration_settings import get_settings_service

from dora.store.models import SettingType, EntityType
from mhq.store.models import SettingType, EntityType


app = Blueprint("pull_requests", __name__)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
from stringcase import snakecase
from voluptuous import Invalid
from werkzeug.exceptions import BadRequest
from dora.store.models.code.workflows import WorkflowFilter
from mhq.store.models.code.workflows import WorkflowFilter

from dora.service.workflows.workflow_filter import get_workflow_filter_processor
from mhq.service.workflows.workflow_filter import get_workflow_filter_processor


def queryschema(schema):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Dict, List
from dora.service.code.models.lead_time import LeadTimeMetrics
from dora.api.resources.core_resources import adapt_user_info
from dora.store.models.code import PullRequest
from dora.store.models.core import Users
from mhq.service.code.models.lead_time import LeadTimeMetrics
from mhq.api.resources.core_resources import adapt_user_info
from mhq.store.models.code import PullRequest
from mhq.store.models.core import Users


def adapt_pull_request(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Dict
from dora.store.models.core.teams import Team
from mhq.store.models.core.teams import Team

from dora.store.models import Users
from mhq.store.models import Users


def adapt_user_info(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Dict
from .core_resources import adapt_user_info
from dora.store.models.core.users import Users
from mhq.store.models.core.users import Users

from dora.service.deployments.models.models import (
from mhq.service.deployments.models.models import (
Deployment,
DeploymentFrequencyMetrics,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from typing import Dict, List
from dora.service.incidents.models.mean_time_to_recovery import (
from mhq.service.incidents.models.mean_time_to_recovery import (
MeanTimeToRecoveryMetrics,
ChangeFailureRateMetrics,
)
from dora.api.resources.deployment_resources import adapt_deployment
from dora.service.deployments.models.models import Deployment
from dora.store.models.incidents import Incident
from dora.api.resources.core_resources import adapt_user_info
from mhq.api.resources.deployment_resources import adapt_deployment
from mhq.service.deployments.models.models import Deployment
from mhq.store.models.incidents import Incident
from mhq.api.resources.core_resources import adapt_user_info


def adapt_incident(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from dora.service.settings.models import (
from mhq.service.settings.models import (
ConfigurationSettings,
IncidentSettings,
ExcludedPRsSetting,
IncidentTypesSetting,
IncidentSourcesSetting,
)
from dora.store.models import EntityType
from mhq.store.models import EntityType


def adapt_configuration_settings_response(config_settings: ConfigurationSettings):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
from voluptuous import Required, Schema, Coerce, All, Optional
from werkzeug.exceptions import BadRequest, NotFound

from dora.api.request_utils import dataschema, queryschema, uuid_validator
from dora.api.resources.settings_resource import adapt_configuration_settings_response
from dora.service.query_validator import get_query_validator
from dora.service.settings import get_settings_service, settings_type_validator
from dora.store.models import Organization, Users, SettingType, EntityType
from mhq.api.request_utils import dataschema, queryschema, uuid_validator
from mhq.api.resources.settings_resource import adapt_configuration_settings_response
from mhq.service.query_validator import get_query_validator
from mhq.service.settings import get_settings_service, settings_type_validator
from mhq.store.models import Organization, Users, SettingType, EntityType

app = Blueprint("settings", __name__)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from flask import Blueprint

from dora.service.sync_data import trigger_data_sync
from dora.utils.time import time_now
from mhq.service.sync_data import trigger_data_sync
from mhq.utils.time import time_now

app = Blueprint("sync", __name__)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from flask import Blueprint
from typing import List
from voluptuous import Required, Schema, Optional
from dora.api.resources.core_resources import adapt_team
from dora.store.models.core.teams import Team
from dora.service.core.teams import get_team_service
from mhq.api.resources.core_resources import adapt_team
from mhq.store.models.core.teams import Team
from mhq.service.core.teams import get_team_service

from dora.api.request_utils import dataschema
from dora.service.query_validator import get_query_validator
from mhq.api.request_utils import dataschema
from mhq.service.query_validator import get_query_validator

app = Blueprint("teams", __name__)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from datetime import datetime
from typing import List

from dora.exapi.models.git_incidents import RevertPRMap
from dora.service.settings import SettingsService, get_settings_service
from dora.store.models import SettingType, EntityType
from dora.store.models.code import PullRequest, PullRequestRevertPRMapping
from dora.store.models.incidents import IncidentSource
from dora.store.repos.code import CodeRepoService
from mhq.exapi.models.git_incidents import RevertPRMap
from mhq.service.settings import SettingsService, get_settings_service
from mhq.store.models import SettingType, EntityType
from mhq.store.models.code import PullRequest, PullRequestRevertPRMapping
from mhq.store.models.incidents import IncidentSource
from mhq.store.repos.code import CodeRepoService


class GitIncidentsAPIService:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from github.PullRequest import PullRequest as GithubPullRequest
from github.Repository import Repository as GithubRepository

from dora.exapi.models.github import GitHubContributor
from dora.utils.log import LOG
from mhq.exapi.models.github import GitHubContributor
from mhq.utils.log import LOG

PAGE_SIZE = 100

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from dataclasses import dataclass
from datetime import datetime

from dora.store.models.code import PullRequest
from mhq.store.models.code import PullRequest


@dataclass
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import List

from dora.store.models import UserIdentityProvider, Integration
from dora.store.repos.core import CoreRepoService
from mhq.store.models import UserIdentityProvider, Integration
from mhq.store.repos.core import CoreRepoService

CODE_INTEGRATION_BUCKET = [
UserIdentityProvider.GITHUB.value,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
from typing import Dict, List
from datetime import datetime
from dora.service.code.models.lead_time import LeadTimeMetrics
from dora.store.models.code.repository import TeamRepos
from mhq.service.code.models.lead_time import LeadTimeMetrics
from mhq.store.models.code.repository import TeamRepos

from dora.store.models.code import PRFilter, PullRequest
from dora.store.repos.code import CodeRepoService
from dora.store.models.core import Team
from mhq.store.models.code import PRFilter, PullRequest
from mhq.store.repos.code import CodeRepoService
from mhq.store.models.core import Team

from dora.service.deployments.deployment_service import (
from mhq.service.deployments.deployment_service import (
DeploymentsService,
get_deployments_service,
)

from dora.utils.time import (
from mhq.utils.time import (
Interval,
fill_missing_week_buckets,
generate_expanded_buckets,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from typing import List, Dict, Any

from dora.service.settings.configuration_settings import get_settings_service
from dora.service.settings.models import ExcludedPRsSetting
from dora.store.models.code import PRFilter
from dora.store.models.settings.configuration_settings import SettingType
from dora.store.models.settings.enums import EntityType
from dora.utils.regex import regex_list
from mhq.service.settings.configuration_settings import get_settings_service
from mhq.service.settings.models import ExcludedPRsSetting
from mhq.store.models.code import PRFilter
from mhq.store.models.settings.configuration_settings import SettingType
from mhq.store.models.settings.enums import EntityType
from mhq.utils.regex import regex_list


def apply_pr_filter(
Expand Down
Loading