Better structures now

Author: horia141

src/cli/jupiter/cli/command/command.py

@@ -15,15 +15,16 @@
 from jupiter.cli.command.rendering import RichConsoleProgressReporterFactory
 from jupiter.cli.session_storage import SessionInfo, SessionStorage
 from jupiter.cli.top_level_context import TopLevelContext
-from jupiter.core.component import (
+from jupiter.core.component import JupiterComponentProperties
+from jupiter.core.domain.app import (
     AppCore,
     AppDistribution,
     AppPlatform,
     AppShell,
-    JupiterComponentProperties,
 )
 from jupiter.core.domain.crm import CRM
 from jupiter.core.domain.storage_engine import DomainStorageEngine, SearchStorageEngine
+from jupiter.core.global_properties import JupiterGlobalProperties
 from jupiter.core.use_cases.infra.use_cases import (
     AppGuestMutationUseCase,
     AppGuestMutationUseCaseContext,
@@ -36,7 +37,6 @@
     AppLoggedInReadonlyUseCaseContext,
     AppLoggedInUseCaseSession,
 )
-from jupiter.core.global_properties import JupiterGlobalProperties
 from jupiter.core.utils.progress_reporter import NoOpProgressReporterFactory
 from jupiter.framework_new.auth.auth_token_stamper import AuthTokenStamper
 from jupiter.framework_new.primitive import Primitive

src/cli/jupiter/cli/command/rendering.py

@@ -7,7 +7,7 @@
 from contextlib import asynccontextmanager, contextmanager
 from typing import Final
 
-from jupiter.core.component import AppComponent
+from jupiter.core.domain.app import AppComponent
 from jupiter.core.domain.application.gamification.user_score_overview import (
     UserScore,
     UserScoreOverview,

src/cli/jupiter/cli/jupiter.py

@@ -12,13 +12,14 @@
 from jupiter.cli.command.rendering import RichConsoleProgressReporterFactory
 from jupiter.cli.session_storage import SessionStorage
 from jupiter.cli.top_level_context import TopLevelContext
-from jupiter.core.component import (
+from jupiter.core.component import JupiterComponentProperties
+from jupiter.core.domain.app import (
     AppCore,
     AppDistribution,
     AppPlatform,
     AppShell,
-    JupiterComponentProperties,
 )
+from jupiter.core.global_properties import build_global_properties
 from jupiter.core.impl.crm.noop import NoOpCRM
 from jupiter.core.impl.repository.sqlite.connection import SqliteConnection
 from jupiter.core.impl.repository.sqlite.domain.storage_engine import (
@@ -33,7 +34,6 @@
     LoadTopLevelInfoArgs,
     LoadTopLevelInfoUseCase,
 )
-from jupiter.core.global_properties import build_global_properties
 from jupiter.framework_new.auth.auth_token_stamper import AuthTokenStamper
 from jupiter.framework_new.persistent_mutation_use_case_recoder import (
     PersistentMutationUseCaseInvocationRecorder,

src/cli/jupiter/cli/migrator.py

@@ -3,8 +3,8 @@
 import asyncio
 
 import jupiter.core.domain
-from jupiter.core.impl.repository.sqlite.connection import SqliteConnection
 from jupiter.core.global_properties import build_global_properties
+from jupiter.core.impl.repository.sqlite.connection import SqliteConnection
 from jupiter.framework_new.realms import ModuleExplorerRealmCodecRegistry
 
 

src/core/jupiter/core/component.py

@@ -2,83 +2,16 @@
 
 from dataclasses import dataclass
 
+from jupiter.core.domain.app import (
+    AppComponent,
+    AppCore,
+    AppDistribution,
+    AppPlatform,
+    AppShell,
+    AppVersion,
+)
 from jupiter.framework_new.component_properties import ComponentProperties
-from jupiter.framework_new.value import AtomicValue, EnumValue, enum_value, value
-
-
-@enum_value
-class AppComponent(EnumValue):
-    """The component of the app."""
-
-    _OLD_WEB = "web"
-    _OLD_CLI = "cli"
-    APP = "app"
-    GC_CRON = "gc-cron"
-    GEN_CRON = "gen-cron"
-    STATS_CRON = "stats-cron"
-    SCHEDULE_EXTERNAL_SYNC_CRON = "schedule-external-sync-cron"
-
-
-@enum_value
-class AppCore(EnumValue):
-    """A client facing application."""
-
-    CLI = "cli"
-    WEBUI = "webui"
-
-
-@enum_value
-class AppShell(EnumValue):
-    """A shell that wraps a given app."""
-
-    CLI = "cli"
-    BROWSER = "browser"
-    DESKTOP_ELECTRON = "desktop-electron"
-    MOBILE_CAPACITOR = "mobile-capacitor"
-    PWA = "pwa"
-
-
-@enum_value
-class AppPlatform(EnumValue):
-    """The platform on which the app is running."""
-
-    DESKTOP_MACOS = "desktop-macos"
-    MOBILE_IOS = "mobile-ios"
-    MOBILE_ANDROID = "mobile-android"
-    TABLET_IOS = "tablet-ios"
-    TABLET_ANDROID = "tablet-android"
-
-
-@enum_value
-class AppDistribution(EnumValue):
-    """The distribution channel of the app."""
-
-    WEB = "web"
-    MAC_WEB = "mac-web"
-    MAC_STORE = "mac-store"
-    APP_STORE = "app-store"
-    GOOGLE_PLAY_STORE = "google-play-store"
-
-
-@enum_value
-class AppDistributionState(EnumValue):
-    """The distribution state of the app."""
-
-    READY = "ready"
-    IN_REVIEW = "in-review"
-    NOT_AVAILABLE = "not-available"
-
-
-@value
-class AppVersion(AtomicValue[str]):
-    """The version of the app."""
-
-    the_version: str
-
-    def __str__(self) -> str:
-        """Transform this to a string version."""
-        return self.the_version
-
+from jupiter.framework_new.value import EnumValue
 
 
 @dataclass(frozen=True)

src/core/jupiter/core/domain/app.py

@@ -0,0 +1,77 @@
+"""A client facing application."""
+
+from jupiter.framework_new.value import AtomicValue, EnumValue, enum_value, value
+
+
+@enum_value
+class AppComponent(EnumValue):
+    """The component of the app."""
+
+    _OLD_WEB = "web"
+    _OLD_CLI = "cli"
+    APP = "app"
+    GC_CRON = "gc-cron"
+    GEN_CRON = "gen-cron"
+    STATS_CRON = "stats-cron"
+    SCHEDULE_EXTERNAL_SYNC_CRON = "schedule-external-sync-cron"
+
+
+@enum_value
+class AppCore(EnumValue):
+    """A client facing application."""
+
+    CLI = "cli"
+    WEBUI = "webui"
+
+
+@enum_value
+class AppShell(EnumValue):
+    """A shell that wraps a given app."""
+
+    CLI = "cli"
+    BROWSER = "browser"
+    DESKTOP_ELECTRON = "desktop-electron"
+    MOBILE_CAPACITOR = "mobile-capacitor"
+    PWA = "pwa"
+
+
+@enum_value
+class AppPlatform(EnumValue):
+    """The platform on which the app is running."""
+
+    DESKTOP_MACOS = "desktop-macos"
+    MOBILE_IOS = "mobile-ios"
+    MOBILE_ANDROID = "mobile-android"
+    TABLET_IOS = "tablet-ios"
+    TABLET_ANDROID = "tablet-android"
+
+
+@enum_value
+class AppDistribution(EnumValue):
+    """The distribution channel of the app."""
+
+    WEB = "web"
+    MAC_WEB = "mac-web"
+    MAC_STORE = "mac-store"
+    APP_STORE = "app-store"
+    GOOGLE_PLAY_STORE = "google-play-store"
+
+
+@enum_value
+class AppDistributionState(EnumValue):
+    """The distribution state of the app."""
+
+    READY = "ready"
+    IN_REVIEW = "in-review"
+    NOT_AVAILABLE = "not-available"
+
+
+@value
+class AppVersion(AtomicValue[str]):
+    """The version of the app."""
+
+    the_version: str
+
+    def __str__(self) -> str:
+        """Transform this to a string version."""
+        return self.the_version

src/core/jupiter/core/domain/app_version_decoder.py

@@ -1,6 +1,6 @@
 """App version decoder."""
 
-from jupiter.core.component import AppVersion
+from jupiter.core.domain.app import AppVersion
 from jupiter.framework_new.errors import InputValidationError
 from jupiter.framework_new.primitive import Primitive
 from jupiter.framework_new.realms import (

src/core/jupiter/core/domain/application/gc/gc_log_entry.py

@@ -2,7 +2,7 @@
 
 import abc
 
-from jupiter.core.component import AppComponent
+from jupiter.core.domain.app import AppComponent
 from jupiter.core.domain.entity_summary import EntitySummary
 from jupiter.core.domain.sync_target import SyncTarget
 from jupiter.framework_new.base.entity_id import EntityId

src/core/jupiter/core/domain/application/gen/gen_log_entry.py

@@ -2,7 +2,7 @@
 
 import abc
 
-from jupiter.core.component import AppComponent
+from jupiter.core.domain.app import AppComponent
 from jupiter.core.domain.core.recurring_task_period import RecurringTaskPeriod
 from jupiter.core.domain.entity_summary import EntitySummary
 from jupiter.core.domain.sync_target import SyncTarget

src/core/jupiter/core/domain/application/stats/stats_log_entry.py

@@ -2,7 +2,7 @@
 
 import abc
 
-from jupiter.core.component import AppComponent
+from jupiter.core.domain.app import AppComponent
 from jupiter.core.domain.entity_summary import EntitySummary
 from jupiter.core.domain.sync_target import SyncTarget
 from jupiter.framework_new.base.adate import ADate