diff --git a/integration_tests/test_suites/daemon-test-suite/auto_run_reexecution_tests/utils.py b/integration_tests/test_suites/daemon-test-suite/auto_run_reexecution_tests/utils.py index a4f70c690282b..bf8187cc20cc8 100644 --- a/integration_tests/test_suites/daemon-test-suite/auto_run_reexecution_tests/utils.py +++ b/integration_tests/test_suites/daemon-test-suite/auto_run_reexecution_tests/utils.py @@ -3,7 +3,7 @@ from contextlib import contextmanager from dagster import job, op, repository -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( JobHandle, ManagedGrpcPythonEnvCodeLocationOrigin, ) diff --git a/integration_tests/test_suites/daemon-test-suite/test_queued.py b/integration_tests/test_suites/daemon-test-suite/test_queued.py index 97041ae9ae97b..802fcfe9cd3e4 100644 --- a/integration_tests/test_suites/daemon-test-suite/test_queued.py +++ b/integration_tests/test_suites/daemon-test-suite/test_queued.py @@ -1,7 +1,7 @@ from typing import Any -from dagster._core.host_representation.external import ExternalJob from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalJob from dagster._core.storage.dagster_run import DagsterRun from dagster._core.test_utils import create_run_for_test, poll_for_finished_run from dagster._utils import file_relative_path diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/asset_checks_loader.py b/python_modules/dagster-graphql/dagster_graphql/implementation/asset_checks_loader.py index 8d06943624380..81bf0d849f5fe 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/asset_checks_loader.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/asset_checks_loader.py @@ -8,10 +8,10 @@ from dagster._core.definitions.events import AssetKey from dagster._core.definitions.remote_asset_graph import RemoteAssetGraph from dagster._core.definitions.selector import RepositorySelector -from dagster._core.host_representation.code_location import CodeLocation -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.external_data import ExternalAssetCheck from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.code_location import CodeLocation +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.external_data import ExternalAssetCheck from dagster._core.storage.asset_check_execution_record import ( AssetCheckExecutionRecord, AssetCheckExecutionResolvedStatus, diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/execution/backfill.py b/python_modules/dagster-graphql/dagster_graphql/implementation/execution/backfill.py index f1a6982d74d22..9481ac85ab547 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/execution/backfill.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/execution/backfill.py @@ -13,7 +13,7 @@ from dagster._core.execution.asset_backfill import create_asset_backfill_data_from_asset_partitions from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill from dagster._core.execution.job_backfill import submit_backfill_runs -from dagster._core.host_representation.external_data import ExternalPartitionExecutionErrorData +from dagster._core.remote_representation.external_data import ExternalPartitionExecutionErrorData from dagster._core.utils import make_new_backfill_id from dagster._core.workspace.permissions import Permissions from dagster._utils import utc_datetime_from_timestamp diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/execution/dynamic_partitions.py b/python_modules/dagster-graphql/dagster_graphql/implementation/execution/dynamic_partitions.py index 352812a62bebf..b9b07fc65dff6 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/execution/dynamic_partitions.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/execution/dynamic_partitions.py @@ -17,7 +17,7 @@ def _repository_contains_dynamic_partitions_def( graphene_info, repository_selector: RepositorySelector, partitions_def_name: str ) -> bool: - from dagster._core.host_representation.external_data import ( + from dagster._core.remote_representation.external_data import ( ExternalDynamicPartitionsDefinitionData, ExternalMultiPartitionsDefinitionData, ExternalPartitionsDefinitionData, diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/execution/run_lifecycle.py b/python_modules/dagster-graphql/dagster_graphql/implementation/execution/run_lifecycle.py index bd4b0f7b1ee27..1848813c6a906 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/execution/run_lifecycle.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/execution/run_lifecycle.py @@ -3,9 +3,9 @@ import dagster._check as check from dagster._core.errors import DagsterRunNotFoundError from dagster._core.execution.plan.state import KnownExecutionState -from dagster._core.host_representation import CodeLocation -from dagster._core.host_representation.external import ExternalJob from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import CodeLocation +from dagster._core.remote_representation.external import ExternalJob from dagster._core.storage.dagster_run import DagsterRun, DagsterRunStatus from dagster._core.storage.tags import RESUME_RETRY_TAG from dagster._core.utils import make_new_run_id diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/external.py b/python_modules/dagster-graphql/dagster_graphql/implementation/external.py index c62ee1dcd7a2b..efd74114a97a1 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/external.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/external.py @@ -5,8 +5,8 @@ from dagster._config import validate_config_from_snap from dagster._core.definitions.selector import JobSubsetSelector, RepositorySelector from dagster._core.execution.plan.state import KnownExecutionState -from dagster._core.host_representation import ExternalJob -from dagster._core.host_representation.external import ExternalExecutionPlan +from dagster._core.remote_representation import ExternalJob +from dagster._core.remote_representation.external import ExternalExecutionPlan from dagster._core.workspace.context import BaseWorkspaceRequestContext, WorkspaceRequestContext from dagster._utils.error import serializable_error_info_from_exc_info diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_asset_checks.py b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_asset_checks.py index ce8bc1f8cbdca..4beab7580af80 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_asset_checks.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_asset_checks.py @@ -3,10 +3,10 @@ import dagster._check as check from dagster import AssetKey from dagster._core.definitions.asset_check_spec import AssetCheckKey -from dagster._core.host_representation.code_location import CodeLocation -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.external_data import ExternalAssetCheck from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.code_location import CodeLocation +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.external_data import ExternalAssetCheck from dagster._core.storage.asset_check_execution_record import ( AssetCheckExecutionRecord, AssetCheckExecutionRecordStatus, diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_assets.py b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_assets.py index 1858c091f4d42..a629d16b5615d 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_assets.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_assets.py @@ -39,10 +39,10 @@ from dagster._core.event_api import AssetRecordsFilter from dagster._core.events import ASSET_EVENTS from dagster._core.events.log import EventLogEntry -from dagster._core.host_representation.code_location import CodeLocation -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.external_data import ExternalAssetNode from dagster._core.instance import DynamicPartitionsStore +from dagster._core.remote_representation.code_location import CodeLocation +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.external_data import ExternalAssetNode from dagster._core.storage.event_log.sql_event_log import get_max_event_records_limit from dagster._core.storage.partition_status_cache import ( build_failed_and_in_progress_partition_subset, diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_env_vars.py b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_env_vars.py index 17fe9b314ddf2..6930ed8ff654e 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_env_vars.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_env_vars.py @@ -11,7 +11,7 @@ ) if TYPE_CHECKING: - from dagster._core.host_representation.code_location import CodeLocation + from dagster._core.remote_representation.code_location import CodeLocation def get_utilized_env_vars_or_error( diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_partition_sets.py b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_partition_sets.py index 33224c6aaa901..cd9febfdc7776 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_partition_sets.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_partition_sets.py @@ -4,11 +4,11 @@ import dagster._check as check from dagster._core.definitions.selector import RepositorySelector from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( ExternalPartitionSet, RepositoryHandle, ) -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( ExternalPartitionExecutionErrorData, ExternalPartitionNamesData, ) diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_resources.py b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_resources.py index 30f684cad233b..06c5bd917fb20 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_resources.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_resources.py @@ -7,7 +7,7 @@ from .utils import UserFacingGraphQLError if TYPE_CHECKING: - from dagster._core.host_representation.code_location import CodeLocation + from dagster._core.remote_representation.code_location import CodeLocation from ..schema.resources import GrapheneResourceDetails, GrapheneResourceDetailsList diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_solids.py b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_solids.py index d36e341d1dbdf..7ab86df41e6ea 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_solids.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/fetch_solids.py @@ -1,7 +1,7 @@ from collections import OrderedDict, defaultdict import dagster._check as check -from dagster._core.host_representation import ExternalRepository +from dagster._core.remote_representation import ExternalRepository from .utils import GraphSelector diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/loader.py b/python_modules/dagster-graphql/dagster_graphql/implementation/loader.py index c63b97fdba93d..832907a41bd91 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/loader.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/loader.py @@ -11,8 +11,8 @@ from dagster._core.definitions.data_version import CachingStaleStatusResolver from dagster._core.definitions.events import AssetKey from dagster._core.events.log import EventLogEntry -from dagster._core.host_representation import ExternalRepository -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation import ExternalRepository +from dagster._core.remote_representation.external_data import ( ExternalAssetDependedBy, ExternalAssetDependency, ExternalAssetNode, diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/run_config_schema.py b/python_modules/dagster-graphql/dagster_graphql/implementation/run_config_schema.py index feb689b9da15e..0911a0e198fc8 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/run_config_schema.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/run_config_schema.py @@ -2,8 +2,8 @@ import dagster._check as check from dagster._config import validate_config_from_snap -from dagster._core.host_representation import RepresentedJob -from dagster._core.host_representation.external_data import DEFAULT_MODE_NAME +from dagster._core.remote_representation import RepresentedJob +from dagster._core.remote_representation.external_data import DEFAULT_MODE_NAME from dagster_graphql.schema.errors import GrapheneModeNotFoundError from dagster_graphql.schema.util import ResolveInfo diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/asset_checks.py b/python_modules/dagster-graphql/dagster_graphql/schema/asset_checks.py index dd7709f10a695..02d348ac65a63 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/asset_checks.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/asset_checks.py @@ -9,7 +9,7 @@ ) from dagster._core.definitions.asset_check_spec import AssetCheckKey, AssetCheckSeverity from dagster._core.events import DagsterEventType -from dagster._core.host_representation.external_data import ExternalAssetCheck +from dagster._core.remote_representation.external_data import ExternalAssetCheck from dagster._core.storage.asset_check_execution_record import ( AssetCheckExecutionRecord, AssetCheckExecutionResolvedStatus, diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/asset_graph.py b/python_modules/dagster-graphql/dagster_graphql/schema/asset_graph.py index 19b6943afa090..159de6318196a 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/asset_graph.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/asset_graph.py @@ -22,9 +22,9 @@ from dagster._core.errors import DagsterInvariantViolationError from dagster._core.event_api import EventRecordsFilter from dagster._core.events import DagsterEventType -from dagster._core.host_representation import CodeLocation, ExternalRepository -from dagster._core.host_representation.external import ExternalJob, ExternalSensor -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation import CodeLocation, ExternalRepository +from dagster._core.remote_representation.external import ExternalJob, ExternalSensor +from dagster._core.remote_representation.external_data import ( ExternalAssetNode, ExternalDynamicPartitionsDefinitionData, ExternalMultiPartitionsDefinitionData, diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/asset_selections.py b/python_modules/dagster-graphql/dagster_graphql/schema/asset_selections.py index 7425094c9d6a9..749f89c7554c6 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/asset_selections.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/asset_selections.py @@ -1,7 +1,7 @@ import graphene from dagster._core.definitions.asset_selection import AssetSelection from dagster._core.definitions.remote_asset_graph import RemoteAssetGraph -from dagster._core.host_representation.external import ExternalRepository +from dagster._core.remote_representation.external import ExternalRepository from ..implementation.fetch_assets import get_asset_nodes_by_asset_key from .asset_key import GrapheneAssetKey diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/backfill.py b/python_modules/dagster-graphql/dagster_graphql/schema/backfill.py index 72c519f6d238e..2ab414eb17d8d 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/backfill.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/backfill.py @@ -17,7 +17,7 @@ BulkActionStatus, PartitionBackfill, ) -from dagster._core.host_representation.external import ExternalPartitionSet +from dagster._core.remote_representation.external import ExternalPartitionSet from dagster._core.storage.dagster_run import RunPartitionData, RunRecord, RunsFilter from dagster._core.storage.tags import BACKFILL_ID_TAG, TagType, get_tag_type from dagster._core.workspace.permissions import Permissions diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/env_vars.py b/python_modules/dagster-graphql/dagster_graphql/schema/env_vars.py index 7681f00e01362..af37bbef7cd34 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/env_vars.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/env_vars.py @@ -1,7 +1,7 @@ from typing import List, Sequence import graphene -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( EnvVarConsumer, ) diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/execution.py b/python_modules/dagster-graphql/dagster_graphql/schema/execution.py index 0ba4b4569f28d..b2140ad25569b 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/execution.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/execution.py @@ -1,6 +1,6 @@ import dagster._check as check import graphene -from dagster._core.host_representation import ExternalExecutionPlan +from dagster._core.remote_representation import ExternalExecutionPlan from dagster._core.snap import ExecutionStepInputSnap, ExecutionStepOutputSnap, ExecutionStepSnap from .metadata import GrapheneMetadataItemDefinition diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/external.py b/python_modules/dagster-graphql/dagster_graphql/schema/external.py index 35e4d57b37a5c..158cf89b72294 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/external.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/external.py @@ -12,14 +12,14 @@ from dagster._core.definitions.sensor_definition import ( SensorType, ) -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( CodeLocation, ExternalRepository, GrpcServerCodeLocation, ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.host_representation.feature_flags import get_feature_flags_for_location -from dagster._core.host_representation.grpc_server_state_subscriber import ( +from dagster._core.remote_representation.feature_flags import get_feature_flags_for_location +from dagster._core.remote_representation.grpc_server_state_subscriber import ( LocationStateChangeEvent, LocationStateChangeEventType, LocationStateSubscriber, @@ -53,7 +53,7 @@ from .util import ResolveInfo, non_null_list if TYPE_CHECKING: - from dagster._core.host_representation.external_data import ExternalAssetNode + from dagster._core.remote_representation.external_data import ExternalAssetNode GrapheneLocationStateChangeEventType = graphene.Enum.from_enum(LocationStateChangeEventType) diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/partition_sets.py b/python_modules/dagster-graphql/dagster_graphql/schema/partition_sets.py index 1fddf798733d4..e406c5af03be1 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/partition_sets.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/partition_sets.py @@ -3,8 +3,8 @@ import dagster._check as check import graphene from dagster import MultiPartitionsDefinition -from dagster._core.host_representation import ExternalPartitionSet, RepositoryHandle -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation import ExternalPartitionSet, RepositoryHandle +from dagster._core.remote_representation.external_data import ( ExternalDynamicPartitionsDefinitionData, ExternalMultiPartitionsDefinitionData, ExternalPartitionsDefinitionData, diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/config.py b/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/config.py index 10c67e1098ccc..cb060c0cee845 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/config.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/config.py @@ -16,7 +16,7 @@ RuntimeMismatchErrorData, SelectorTypeErrorData, ) -from dagster._core.host_representation.represented import RepresentedJob +from dagster._core.remote_representation.represented import RepresentedJob from dagster._utils.error import SerializableErrorInfo from graphene.types.generic import GenericScalar diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/pipeline.py b/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/pipeline.py index 60b9e30db49cb..f0bd4ce991b2a 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/pipeline.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/pipeline.py @@ -4,9 +4,9 @@ import graphene from dagster._core.definitions.time_window_partitions import PartitionRangeStatus from dagster._core.events import DagsterEventType -from dagster._core.host_representation.external import ExternalExecutionPlan, ExternalJob -from dagster._core.host_representation.external_data import DEFAULT_MODE_NAME, ExternalPresetData -from dagster._core.host_representation.represented import RepresentedJob +from dagster._core.remote_representation.external import ExternalExecutionPlan, ExternalJob +from dagster._core.remote_representation.external_data import DEFAULT_MODE_NAME, ExternalPresetData +from dagster._core.remote_representation.represented import RepresentedJob from dagster._core.storage.dagster_run import ( DagsterRunStatsSnapshot, DagsterRunStatus, diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/snapshot.py b/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/snapshot.py index d580a43f9626b..88eb724e3a9c8 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/snapshot.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/pipelines/snapshot.py @@ -1,6 +1,6 @@ import dagster._check as check import graphene -from dagster._core.host_representation import RepresentedJob +from dagster._core.remote_representation import RepresentedJob from ..errors import ( GraphenePipelineNotFoundError, diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/repository_origin.py b/python_modules/dagster-graphql/dagster_graphql/schema/repository_origin.py index 6cbb0629a1800..b3caf0518f5db 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/repository_origin.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/repository_origin.py @@ -2,7 +2,7 @@ import dagster._check as check import graphene -from dagster._core.host_representation import ExternalRepositoryOrigin +from dagster._core.remote_representation import ExternalRepositoryOrigin from .util import ResolveInfo, non_null_list diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/resources.py b/python_modules/dagster-graphql/dagster_graphql/schema/resources.py index 2cf7d4b90085b..210ccde9510e0 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/resources.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/resources.py @@ -3,8 +3,8 @@ import dagster._check as check import graphene from dagster._core.definitions.selector import ResourceSelector -from dagster._core.host_representation.external import ExternalRepository, ExternalResource -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external import ExternalRepository, ExternalResource +from dagster._core.remote_representation.external_data import ( ExternalResourceConfigEnvVar, ExternalResourceValue, NestedResourceType, diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/run_config.py b/python_modules/dagster-graphql/dagster_graphql/schema/run_config.py index e1eefb7e865f8..02ed244d069f2 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/run_config.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/run_config.py @@ -2,8 +2,8 @@ import dagster._check as check import graphene -from dagster._core.host_representation import RepresentedJob -from dagster._core.host_representation.external_data import DEFAULT_MODE_NAME +from dagster._core.remote_representation import RepresentedJob +from dagster._core.remote_representation.external_data import DEFAULT_MODE_NAME from dagster._core.snap.snap_to_yaml import default_values_yaml_from_type_snap from ..implementation.run_config_schema import resolve_is_run_config_valid diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/schedules/schedules.py b/python_modules/dagster-graphql/dagster_graphql/schema/schedules/schedules.py index eac367ddb8a01..46776c01da80b 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/schedules/schedules.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/schedules/schedules.py @@ -3,7 +3,7 @@ import dagster._check as check import graphene from dagster import DefaultScheduleStatus -from dagster._core.host_representation import ExternalSchedule +from dagster._core.remote_representation import ExternalSchedule from dagster._core.scheduler.instigation import InstigatorState, InstigatorStatus from dagster._seven import get_current_datetime_in_utc, get_timestamp_from_utc_datetime diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/sensors.py b/python_modules/dagster-graphql/dagster_graphql/schema/sensors.py index b700aca957f98..4d9d149efc10b 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/sensors.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/sensors.py @@ -7,8 +7,8 @@ from dagster._core.definitions.sensor_definition import ( SensorType, ) -from dagster._core.host_representation import ExternalSensor, ExternalTargetData -from dagster._core.host_representation.external import ExternalRepository +from dagster._core.remote_representation import ExternalSensor, ExternalTargetData +from dagster._core.remote_representation.external import ExternalRepository from dagster._core.scheduler.instigation import InstigatorState, InstigatorStatus from dagster._core.workspace.permissions import Permissions diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/solids.py b/python_modules/dagster-graphql/dagster_graphql/schema/solids.py index 71a6311bc9de5..36047c8bd9daa 100644 --- a/python_modules/dagster-graphql/dagster_graphql/schema/solids.py +++ b/python_modules/dagster-graphql/dagster_graphql/schema/solids.py @@ -5,9 +5,9 @@ import graphene from dagster._core.definitions import NodeHandle from dagster._core.definitions.asset_graph_differ import AssetGraphDiffer -from dagster._core.host_representation import RepresentedJob -from dagster._core.host_representation.external import ExternalJob -from dagster._core.host_representation.historical import HistoricalJob +from dagster._core.remote_representation import RepresentedJob +from dagster._core.remote_representation.external import ExternalJob +from dagster._core.remote_representation.historical import HistoricalJob from dagster._core.snap import DependencyStructureIndex, GraphDefSnap, OpDefSnap from dagster._core.snap.node import InputMappingSnap, OutputMappingSnap from dagster._core.storage.dagster_run import RunsFilter diff --git a/python_modules/dagster-graphql/dagster_graphql/test/utils.py b/python_modules/dagster-graphql/dagster_graphql/test/utils.py index aa7b507f04d45..fd18cbd4d0f20 100644 --- a/python_modules/dagster-graphql/dagster_graphql/test/utils.py +++ b/python_modules/dagster-graphql/dagster_graphql/test/utils.py @@ -6,8 +6,8 @@ import dagster._check as check import graphene -from dagster._core.host_representation.external import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalRepository from dagster._core.test_utils import wait_for_runs_to_finish from dagster._core.workspace.context import WorkspaceProcessContext, WorkspaceRequestContext from dagster._core.workspace.load_target import PythonFileTarget diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/repo.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/repo.py index f355b00e5df30..e712750e52a8c 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/repo.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/repo.py @@ -104,8 +104,8 @@ from dagster._core.definitions.sensor_definition import RunRequest, SensorDefinition, SkipReason from dagster._core.definitions.unresolved_asset_job_definition import UnresolvedAssetJobDefinition from dagster._core.errors import DagsterInvalidDefinitionError -from dagster._core.host_representation.external import ExternalRepository from dagster._core.log_manager import coerce_valid_log_level +from dagster._core.remote_representation.external import ExternalRepository from dagster._core.storage.dagster_run import DagsterRunStatus from dagster._core.storage.tags import RESUME_RETRY_TAG from dagster._core.workspace.context import WorkspaceProcessContext, WorkspaceRequestContext diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_asset_condition_evaluations.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_asset_condition_evaluations.py index 4abe43a5eeaeb..b5522f0bf1b5a 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_asset_condition_evaluations.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_asset_condition_evaluations.py @@ -19,7 +19,7 @@ from dagster._core.definitions.partition import PartitionsDefinition, StaticPartitionsDefinition from dagster._core.definitions.run_request import InstigatorType from dagster._core.definitions.sensor_definition import SensorType -from dagster._core.host_representation.origin import ExternalInstigatorOrigin +from dagster._core.remote_representation.origin import ExternalInstigatorOrigin from dagster._core.scheduler.instigation import ( InstigatorState, InstigatorStatus, diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_context.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_context.py index 20fb4834e6640..5089cb39bc430 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_context.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_context.py @@ -5,7 +5,7 @@ import pytest from dagster import job, op, repository -from dagster._core.host_representation.code_location import GrpcServerCodeLocation +from dagster._core.remote_representation.code_location import GrpcServerCodeLocation from dagster._core.test_utils import instance_for_test from dagster_graphql.test.utils import ( define_out_of_process_workspace, @@ -41,7 +41,7 @@ def test_can_reload_on_external_repository_error(): # note it where the function is *used* that needs to mocked, not # where it is defined. # see https://docs.python.org/3/library/unittest.mock.html#where-to-patch - "dagster._core.host_representation.code_location.sync_get_streaming_external_repositories_data_grpc" + "dagster._core.remote_representation.code_location.sync_get_streaming_external_repositories_data_grpc" ) as external_repository_mock: external_repository_mock.side_effect = Exception("get_external_repo_failure") diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_dagster_environment.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_dagster_environment.py index a951a6f15f850..94e6c7ee2808a 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_dagster_environment.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_dagster_environment.py @@ -1,6 +1,6 @@ import sys -from dagster._core.host_representation import ManagedGrpcPythonEnvCodeLocationOrigin +from dagster._core.remote_representation import ManagedGrpcPythonEnvCodeLocationOrigin from dagster._core.test_utils import instance_for_test from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._utils import file_relative_path diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_partition_backfill.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_partition_backfill.py index 2fb2c93be2a26..58ed133389699 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_partition_backfill.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_partition_backfill.py @@ -21,7 +21,7 @@ BulkActionStatus, PartitionBackfill, ) -from dagster._core.host_representation.origin import ExternalPartitionSetOrigin +from dagster._core.remote_representation.origin import ExternalPartitionSetOrigin from dagster._core.storage.dagster_run import DagsterRun, DagsterRunStatus, RunsFilter from dagster._core.storage.tags import BACKFILL_ID_TAG, PARTITION_NAME_TAG from dagster._core.test_utils import create_run_for_test, environ diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_reload_repository_location.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_reload_repository_location.py index e14a7d9a582ba..2e5ada2e18abc 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_reload_repository_location.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_reload_repository_location.py @@ -4,7 +4,7 @@ from dagster import file_relative_path, repository from dagster._core.code_pointer import CodePointer -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( ManagedGrpcPythonEnvCodeLocationOrigin, external_repository_data_from_def, ) @@ -289,13 +289,13 @@ def test_out_of_process_reload_location(self, graphql_context): # note it where the function is *used* that needs to mocked, not # where it is defined. # see https://docs.python.org/3/library/unittest.mock.html#where-to-patch - "dagster._core.host_representation.code_location.sync_list_repositories_grpc" + "dagster._core.remote_representation.code_location.sync_list_repositories_grpc" ) as cli_command_mock: with mock.patch( # note it where the function is *used* that needs to mocked, not # where it is defined. # see https://docs.python.org/3/library/unittest.mock.html#where-to-patch - "dagster._core.host_representation.code_location.sync_get_streaming_external_repositories_data_grpc" + "dagster._core.remote_representation.code_location.sync_get_streaming_external_repositories_data_grpc" ) as external_repository_mock: @repository @@ -356,7 +356,7 @@ def test_reload_failure(self, graphql_context): # note it where the function is *used* that needs to mocked, not # where it is defined. # see https://docs.python.org/3/library/unittest.mock.html#where-to-patch - "dagster._core.host_representation.code_location.sync_list_repositories_grpc" + "dagster._core.remote_representation.code_location.sync_list_repositories_grpc" ) as cli_command_mock: cli_command_mock.side_effect = Exception("Mocked repository load failure") diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_scheduler.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_scheduler.py index 6bff50f8c6353..18c4efa08f22e 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_scheduler.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_scheduler.py @@ -3,7 +3,7 @@ import pendulum import pytest -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( ExternalRepositoryOrigin, InProcessCodeLocationOrigin, ) diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_sensors.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_sensors.py index 15db4cb1bca0b..05ac9837f9eb9 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_sensors.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_sensors.py @@ -7,7 +7,7 @@ from dagster._core.definitions.sensor_definition import ( SensorType, ) -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( ExternalRepositoryOrigin, InProcessCodeLocationOrigin, ) diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_watch_grpc_server.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_watch_grpc_server.py index 09ac1b651f1e8..72a70751fafcc 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_watch_grpc_server.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_watch_grpc_server.py @@ -1,7 +1,7 @@ import time from typing import Any -from dagster._core.host_representation.grpc_server_state_subscriber import ( +from dagster._core.remote_representation.grpc_server_state_subscriber import ( LocationStateChangeEvent, LocationStateChangeEventType, LocationStateSubscriber, diff --git a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_workspace.py b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_workspace.py index e374371f6077b..e79d8b9de7791 100644 --- a/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_workspace.py +++ b/python_modules/dagster-graphql/dagster_graphql_tests/graphql/test_workspace.py @@ -5,8 +5,8 @@ import pytest from dagster import file_relative_path -from dagster._core.host_representation import ManagedGrpcPythonEnvCodeLocationOrigin -from dagster._core.host_representation.feature_flags import ( +from dagster._core.remote_representation import ManagedGrpcPythonEnvCodeLocationOrigin +from dagster._core.remote_representation.feature_flags import ( CodeLocationFeatureFlags, ) from dagster._core.test_utils import environ diff --git a/python_modules/dagster-test/dagster_test/test_project/__init__.py b/python_modules/dagster-test/dagster_test/test_project/__init__.py index 264557f544472..922b7c565f18b 100644 --- a/python_modules/dagster-test/dagster_test/test_project/__init__.py +++ b/python_modules/dagster-test/dagster_test/test_project/__init__.py @@ -13,23 +13,23 @@ from dagster._core.execution.api import create_execution_plan from dagster._core.execution.build_resources import build_resources from dagster._core.execution.context.output import build_output_context -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.origin import ( + DEFAULT_DAGSTER_ENTRY_POINT, + JobPythonOrigin, + RepositoryPythonOrigin, +) +from dagster._core.remote_representation import ( ExternalJob, ExternalSchedule, GrpcServerCodeLocationOrigin, InProcessCodeLocationOrigin, ) -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.origin import ( ExternalInstigatorOrigin, ExternalJobOrigin, ExternalRepositoryOrigin, ) -from dagster._core.instance import DagsterInstance -from dagster._core.origin import ( - DEFAULT_DAGSTER_ENTRY_POINT, - JobPythonOrigin, - RepositoryPythonOrigin, -) from dagster._core.test_utils import in_process_test_workspace from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._serdes import create_snapshot_id diff --git a/python_modules/dagster/dagster/_api/snapshot_execution_plan.py b/python_modules/dagster/dagster/_api/snapshot_execution_plan.py index 3478b7442a9bc..b55220c004c44 100644 --- a/python_modules/dagster/dagster/_api/snapshot_execution_plan.py +++ b/python_modules/dagster/dagster/_api/snapshot_execution_plan.py @@ -5,9 +5,9 @@ from dagster._core.definitions.events import AssetKey from dagster._core.errors import DagsterUserCodeProcessError from dagster._core.execution.plan.state import KnownExecutionState -from dagster._core.host_representation.external_data import DEFAULT_MODE_NAME -from dagster._core.host_representation.origin import ExternalJobOrigin from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external_data import DEFAULT_MODE_NAME +from dagster._core.remote_representation.origin import ExternalJobOrigin from dagster._core.snap.execution_plan_snapshot import ( ExecutionPlanSnapshot, ExecutionPlanSnapshotErrorData, diff --git a/python_modules/dagster/dagster/_api/snapshot_job.py b/python_modules/dagster/dagster/_api/snapshot_job.py index 393c4c3a1c421..a2d6a7c92838f 100644 --- a/python_modules/dagster/dagster/_api/snapshot_job.py +++ b/python_modules/dagster/dagster/_api/snapshot_job.py @@ -4,8 +4,8 @@ from dagster._core.definitions.asset_check_spec import AssetCheckKey from dagster._core.definitions.events import AssetKey from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation.external_data import ExternalJobSubsetResult -from dagster._core.host_representation.origin import ExternalJobOrigin +from dagster._core.remote_representation.external_data import ExternalJobSubsetResult +from dagster._core.remote_representation.origin import ExternalJobOrigin from dagster._grpc.types import JobSubsetSnapshotArgs from dagster._serdes import deserialize_value diff --git a/python_modules/dagster/dagster/_api/snapshot_partition.py b/python_modules/dagster/dagster/_api/snapshot_partition.py index 3869b73a8b14c..020ce8c58eb2c 100644 --- a/python_modules/dagster/dagster/_api/snapshot_partition.py +++ b/python_modules/dagster/dagster/_api/snapshot_partition.py @@ -2,15 +2,15 @@ import dagster._check as check from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation.external_data import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external_data import ( ExternalPartitionConfigData, ExternalPartitionExecutionErrorData, ExternalPartitionNamesData, ExternalPartitionSetExecutionParamData, ExternalPartitionTagsData, ) -from dagster._core.host_representation.handle import RepositoryHandle -from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.handle import RepositoryHandle from dagster._grpc.types import PartitionArgs, PartitionNamesArgs, PartitionSetExecutionParamArgs from dagster._serdes import deserialize_value diff --git a/python_modules/dagster/dagster/_api/snapshot_repository.py b/python_modules/dagster/dagster/_api/snapshot_repository.py index 5d1683ba184f0..1fbe06326e88a 100644 --- a/python_modules/dagster/dagster/_api/snapshot_repository.py +++ b/python_modules/dagster/dagster/_api/snapshot_repository.py @@ -2,21 +2,21 @@ import dagster._check as check from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( ExternalRepositoryData, ExternalRepositoryErrorData, ) from dagster._serdes import deserialize_value if TYPE_CHECKING: - from dagster._core.host_representation import CodeLocation + from dagster._core.remote_representation import CodeLocation from dagster._grpc.client import DagsterGrpcClient def sync_get_streaming_external_repositories_data_grpc( api_client: "DagsterGrpcClient", code_location: "CodeLocation" ) -> Mapping[str, ExternalRepositoryData]: - from dagster._core.host_representation import CodeLocation, ExternalRepositoryOrigin + from dagster._core.remote_representation import CodeLocation, ExternalRepositoryOrigin check.inst_param(code_location, "code_location", CodeLocation) diff --git a/python_modules/dagster/dagster/_api/snapshot_schedule.py b/python_modules/dagster/dagster/_api/snapshot_schedule.py index 29eed8df2f05a..28836889d5b60 100644 --- a/python_modules/dagster/dagster/_api/snapshot_schedule.py +++ b/python_modules/dagster/dagster/_api/snapshot_schedule.py @@ -3,9 +3,9 @@ import dagster._check as check from dagster._core.definitions.schedule_definition import ScheduleExecutionData from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation.external_data import ExternalScheduleExecutionErrorData -from dagster._core.host_representation.handle import RepositoryHandle from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external_data import ExternalScheduleExecutionErrorData +from dagster._core.remote_representation.handle import RepositoryHandle from dagster._grpc.types import ExternalScheduleExecutionArgs from dagster._serdes import deserialize_value from dagster._seven.compat.pendulum import PendulumDateTime diff --git a/python_modules/dagster/dagster/_api/snapshot_sensor.py b/python_modules/dagster/dagster/_api/snapshot_sensor.py index 4a9504df3becd..ed2044f459e59 100644 --- a/python_modules/dagster/dagster/_api/snapshot_sensor.py +++ b/python_modules/dagster/dagster/_api/snapshot_sensor.py @@ -3,8 +3,8 @@ import dagster._check as check from dagster._core.definitions.sensor_definition import SensorExecutionData from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation.external_data import ExternalSensorExecutionErrorData -from dagster._core.host_representation.handle import RepositoryHandle +from dagster._core.remote_representation.external_data import ExternalSensorExecutionErrorData +from dagster._core.remote_representation.handle import RepositoryHandle from dagster._grpc.client import DEFAULT_GRPC_TIMEOUT from dagster._grpc.types import SensorExecutionArgs from dagster._serdes import deserialize_value diff --git a/python_modules/dagster/dagster/_cli/job.py b/python_modules/dagster/dagster/_cli/job.py index b99874cd8aa71..2781218f39d15 100644 --- a/python_modules/dagster/dagster/_cli/job.py +++ b/python_modules/dagster/dagster/_cli/job.py @@ -36,17 +36,17 @@ from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill from dagster._core.execution.execution_result import ExecutionResult from dagster._core.execution.job_backfill import create_backfill_run -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ( CodeLocation, ExternalJob, ExternalRepository, RepositoryHandle, ) -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( ExternalPartitionNamesData, ExternalPartitionSetExecutionParamData, ) -from dagster._core.instance import DagsterInstance from dagster._core.snap import JobSnapshot, NodeInvocationSnap from dagster._core.storage.dagster_run import DagsterRun from dagster._core.storage.tags import MEMOIZED_RUN_TAG diff --git a/python_modules/dagster/dagster/_cli/schedule.py b/python_modules/dagster/dagster/_cli/schedule.py index 6df0ebee633a3..5faf93fc4d588 100644 --- a/python_modules/dagster/dagster/_cli/schedule.py +++ b/python_modules/dagster/dagster/_cli/schedule.py @@ -14,8 +14,8 @@ repository_target_argument, ) from dagster._core.definitions.run_request import InstigatorType -from dagster._core.host_representation import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalRepository from dagster._core.scheduler.instigation import InstigatorStatus from dagster._core.scheduler.scheduler import DagsterDaemonScheduler diff --git a/python_modules/dagster/dagster/_cli/sensor.py b/python_modules/dagster/dagster/_cli/sensor.py index 971e9923f5cf1..be976de293514 100644 --- a/python_modules/dagster/dagster/_cli/sensor.py +++ b/python_modules/dagster/dagster/_cli/sensor.py @@ -15,8 +15,8 @@ repository_target_argument, ) from dagster._core.definitions.run_request import InstigatorType -from dagster._core.host_representation import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalRepository from dagster._core.scheduler.instigation import ( InstigatorState, InstigatorStatus, diff --git a/python_modules/dagster/dagster/_cli/workspace/cli_target.py b/python_modules/dagster/dagster/_cli/workspace/cli_target.py index 4450f9a7cd57a..e82af325370c4 100644 --- a/python_modules/dagster/dagster/_cli/workspace/cli_target.py +++ b/python_modules/dagster/dagster/_cli/workspace/cli_target.py @@ -26,14 +26,14 @@ from dagster._core.code_pointer import CodePointer from dagster._core.definitions.reconstruct import repository_def_from_target_def from dagster._core.definitions.repository_definition import RepositoryDefinition -from dagster._core.host_representation.code_location import CodeLocation -from dagster._core.host_representation.external import ExternalRepository from dagster._core.instance import DagsterInstance from dagster._core.origin import ( DEFAULT_DAGSTER_ENTRY_POINT, JobPythonOrigin, RepositoryPythonOrigin, ) +from dagster._core.remote_representation.code_location import CodeLocation +from dagster._core.remote_representation.external import ExternalRepository from dagster._core.workspace.context import WorkspaceRequestContext from dagster._core.workspace.load_target import ( CompositeTarget, @@ -52,7 +52,7 @@ if TYPE_CHECKING: from dagster._core.workspace.context import WorkspaceProcessContext -from dagster._core.host_representation.external import ExternalJob +from dagster._core.remote_representation.external import ExternalJob WORKSPACE_TARGET_WARNING = ( "Can only use ONE of --workspace/-w, --python-file/-f, --module-name/-m, --grpc-port," diff --git a/python_modules/dagster/dagster/_core/definitions/asset_graph_differ.py b/python_modules/dagster/dagster/_core/definitions/asset_graph_differ.py index 9334cc223f269..72eaf0838e998 100644 --- a/python_modules/dagster/dagster/_core/definitions/asset_graph_differ.py +++ b/python_modules/dagster/dagster/_core/definitions/asset_graph_differ.py @@ -4,7 +4,7 @@ import dagster._check as check from dagster._core.definitions.remote_asset_graph import RemoteAssetGraph from dagster._core.errors import DagsterInvariantViolationError -from dagster._core.host_representation import ExternalRepository +from dagster._core.remote_representation import ExternalRepository from dagster._core.workspace.context import BaseWorkspaceRequestContext if TYPE_CHECKING: diff --git a/python_modules/dagster/dagster/_core/definitions/job_definition.py b/python_modules/dagster/dagster/_core/definitions/job_definition.py index 58df3c0a3037a..f8788298adda5 100644 --- a/python_modules/dagster/dagster/_core/definitions/job_definition.py +++ b/python_modules/dagster/dagster/_core/definitions/job_definition.py @@ -87,8 +87,8 @@ from dagster._core.definitions.run_config import RunConfig from dagster._core.execution.execute_in_process_result import ExecuteInProcessResult from dagster._core.execution.resources_init import InitResourceContext - from dagster._core.host_representation.job_index import JobIndex from dagster._core.instance import DagsterInstance, DynamicPartitionsStore + from dagster._core.remote_representation.job_index import JobIndex from dagster._core.snap import JobSnapshot from .run_config_schema import RunConfigSchema @@ -954,7 +954,7 @@ def get_job_snapshot(self) -> "JobSnapshot": return self.get_job_index().job_snapshot def get_job_index(self) -> "JobIndex": - from dagster._core.host_representation import JobIndex + from dagster._core.remote_representation import JobIndex from dagster._core.snap import JobSnapshot return JobIndex(JobSnapshot.from_job_def(self), self.get_parent_job_snapshot()) diff --git a/python_modules/dagster/dagster/_core/definitions/partition.py b/python_modules/dagster/dagster/_core/definitions/partition.py index 2f15bf7d05745..14f5f59584d6e 100644 --- a/python_modules/dagster/dagster/_core/definitions/partition.py +++ b/python_modules/dagster/dagster/_core/definitions/partition.py @@ -711,7 +711,7 @@ def get_tags_for_partition_key( partition_key: str, job_name: Optional[str] = None, ) -> Mapping[str, str]: - from dagster._core.host_representation.external_data import ( + from dagster._core.remote_representation.external_data import ( external_partition_set_name_for_job_name, ) diff --git a/python_modules/dagster/dagster/_core/definitions/remote_asset_graph.py b/python_modules/dagster/dagster/_core/definitions/remote_asset_graph.py index 4561d9007ad94..534bc65301fe3 100644 --- a/python_modules/dagster/dagster/_core/definitions/remote_asset_graph.py +++ b/python_modules/dagster/dagster/_core/definitions/remote_asset_graph.py @@ -22,8 +22,8 @@ from dagster._core.definitions.assets_job import ASSET_BASE_JOB_PREFIX from dagster._core.definitions.auto_materialize_policy import AutoMaterializePolicy from dagster._core.definitions.metadata import ArbitraryMetadataMapping -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.handle import RepositoryHandle +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.handle import RepositoryHandle from dagster._core.workspace.workspace import IWorkspace from .backfill_policy import BackfillPolicy @@ -34,7 +34,7 @@ from .partition_mapping import PartitionMapping if TYPE_CHECKING: - from dagster._core.host_representation.external_data import ( + from dagster._core.remote_representation.external_data import ( ExternalAssetCheck, ExternalAssetNode, ) @@ -484,7 +484,7 @@ def _build_execution_set_index( external_asset_nodes: Iterable["ExternalAssetNode"], external_asset_checks: Iterable["ExternalAssetCheck"], ) -> Mapping[AssetKeyOrCheckKey, AbstractSet[AssetKeyOrCheckKey]]: - from dagster._core.host_representation.external_data import ExternalAssetNode + from dagster._core.remote_representation.external_data import ExternalAssetNode all_items = [*external_asset_nodes, *external_asset_checks] diff --git a/python_modules/dagster/dagster/_core/definitions/time_window_partitions.py b/python_modules/dagster/dagster/_core/definitions/time_window_partitions.py index 7f7801b26f083..906c64ead9e7f 100644 --- a/python_modules/dagster/dagster/_core/definitions/time_window_partitions.py +++ b/python_modules/dagster/dagster/_core/definitions/time_window_partitions.py @@ -2041,7 +2041,7 @@ def __repr__(self) -> str: return f"PartitionKeysTimeWindowPartitionsSubset({self.get_partition_key_ranges(self.partitions_def)})" def to_serializable_subset(self) -> "TimeWindowPartitionsSubset": - from dagster._core.host_representation.external_data import ( + from dagster._core.remote_representation.external_data import ( external_time_window_partitions_definition_from_def, ) @@ -2203,7 +2203,7 @@ def __repr__(self) -> str: return f"TimeWindowPartitionsSubset({self.get_partition_key_ranges(self.partitions_def)})" def to_serializable_subset(self) -> "TimeWindowPartitionsSubset": - from dagster._core.host_representation.external_data import ( + from dagster._core.remote_representation.external_data import ( external_time_window_partitions_definition_from_def, ) diff --git a/python_modules/dagster/dagster/_core/execution/backfill.py b/python_modules/dagster/dagster/_core/execution/backfill.py index b122cfc871439..34a35eb027fb1 100644 --- a/python_modules/dagster/dagster/_core/execution/backfill.py +++ b/python_modules/dagster/dagster/_core/execution/backfill.py @@ -10,8 +10,8 @@ from dagster._core.definitions.remote_asset_graph import RemoteAssetGraph from dagster._core.errors import DagsterDefinitionChangedDeserializationError from dagster._core.execution.bulk_actions import BulkActionType -from dagster._core.host_representation.origin import ExternalPartitionSetOrigin from dagster._core.instance import DynamicPartitionsStore +from dagster._core.remote_representation.origin import ExternalPartitionSetOrigin from dagster._core.storage.tags import USER_TAG from dagster._core.workspace.workspace import IWorkspace from dagster._serdes import whitelist_for_serdes diff --git a/python_modules/dagster/dagster/_core/execution/job_backfill.py b/python_modules/dagster/dagster/_core/execution/job_backfill.py index ee8fe558c0f69..602799c40a02a 100644 --- a/python_modules/dagster/dagster/_core/execution/job_backfill.py +++ b/python_modules/dagster/dagster/_core/execution/job_backfill.py @@ -7,17 +7,17 @@ from dagster._core.errors import DagsterBackfillFailedError from dagster._core.execution.plan.resume_retry import ReexecutionStrategy from dagster._core.execution.plan.state import KnownExecutionState -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ( CodeLocation, ExternalJob, ExternalPartitionSet, ) -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( ExternalPartitionExecutionParamData, ExternalPartitionSetExecutionParamData, ) -from dagster._core.host_representation.origin import ExternalPartitionSetOrigin -from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.origin import ExternalPartitionSetOrigin from dagster._core.storage.dagster_run import DagsterRun, DagsterRunStatus, RunsFilter from dagster._core.storage.tags import ( PARENT_RUN_ID_TAG, diff --git a/python_modules/dagster/dagster/_core/execution/plan/state.py b/python_modules/dagster/dagster/_core/execution/plan/state.py index d88eccd96cdf1..d87b072cee939 100644 --- a/python_modules/dagster/dagster/_core/execution/plan/state.py +++ b/python_modules/dagster/dagster/_core/execution/plan/state.py @@ -216,7 +216,7 @@ def _derive_state_of_past_run( ) -> Tuple[ Sequence[str], Mapping[str, Mapping[str, Optional[Sequence[str]]]], Set[StepOutputHandle] ]: - from dagster._core.host_representation import ExternalExecutionPlan + from dagster._core.remote_representation import ExternalExecutionPlan check.inst_param(instance, "instance", DagsterInstance) check.opt_inst_param(parent_run, "parent_run", DagsterRun) diff --git a/python_modules/dagster/dagster/_core/execution/submit_asset_runs.py b/python_modules/dagster/dagster/_core/execution/submit_asset_runs.py index 5c58b36939bd1..6a21e5651594e 100644 --- a/python_modules/dagster/dagster/_core/execution/submit_asset_runs.py +++ b/python_modules/dagster/dagster/_core/execution/submit_asset_runs.py @@ -13,8 +13,8 @@ DagsterCodeLocationLoadError, DagsterUserCodeUnreachableError, ) -from dagster._core.host_representation import ExternalExecutionPlan, ExternalJob from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalExecutionPlan, ExternalJob from dagster._core.snap import ExecutionPlanSnapshot from dagster._core.storage.dagster_run import DagsterRun, DagsterRunStatus from dagster._core.workspace.context import BaseWorkspaceRequestContext, IWorkspaceProcessContext diff --git a/python_modules/dagster/dagster/_core/instance/__init__.py b/python_modules/dagster/dagster/_core/instance/__init__.py index 701c7bf336ad7..430e65640b61e 100644 --- a/python_modules/dagster/dagster/_core/instance/__init__.py +++ b/python_modules/dagster/dagster/_core/instance/__init__.py @@ -130,15 +130,15 @@ from dagster._core.execution.plan.plan import ExecutionPlan from dagster._core.execution.plan.resume_retry import ReexecutionStrategy from dagster._core.execution.stats import RunStepKeyStatsSnapshot - from dagster._core.host_representation import ( + from dagster._core.launcher import RunLauncher + from dagster._core.remote_representation import ( CodeLocation, ExternalJob, ExternalJobOrigin, ExternalSensor, HistoricalJob, ) - from dagster._core.host_representation.external import ExternalSchedule - from dagster._core.launcher import RunLauncher + from dagster._core.remote_representation.external import ExternalSchedule from dagster._core.run_coordinator import RunCoordinator from dagster._core.scheduler import Scheduler, SchedulerDebugInfo from dagster._core.scheduler.instigation import ( @@ -1058,7 +1058,7 @@ def has_snapshot(self, snapshot_id: str) -> bool: @traced def get_historical_job(self, snapshot_id: str) -> "HistoricalJob": - from dagster._core.host_representation import HistoricalJob + from dagster._core.remote_representation import HistoricalJob snapshot = self._run_storage.get_job_snapshot(snapshot_id) parent_snapshot = ( @@ -1472,7 +1472,7 @@ def create_run( ) -> DagsterRun: from dagster._core.definitions.asset_check_spec import AssetCheckKey from dagster._core.definitions.utils import validate_tags - from dagster._core.host_representation.origin import ExternalJobOrigin + from dagster._core.remote_representation.origin import ExternalJobOrigin from dagster._core.snap import ExecutionPlanSnapshot, JobSnapshot check.str_param(job_name, "job_name") @@ -1620,7 +1620,7 @@ def create_reexecuted_run( ReexecutionStrategy, ) from dagster._core.execution.plan.state import KnownExecutionState - from dagster._core.host_representation import CodeLocation, ExternalJob + from dagster._core.remote_representation import CodeLocation, ExternalJob check.inst_param(parent_run, "parent_run", DagsterRun) check.inst_param(code_location, "code_location", CodeLocation) @@ -2531,7 +2531,7 @@ def submit_run(self, run_id: str, workspace: "IWorkspace") -> DagsterRun: Args: run_id (str): The id of the run. """ - from dagster._core.host_representation import ExternalJobOrigin + from dagster._core.remote_representation import ExternalJobOrigin from dagster._core.run_coordinator import SubmitRunContext run = self.get_run_by_id(run_id) diff --git a/python_modules/dagster/dagster/_core/launcher/default_run_launcher.py b/python_modules/dagster/dagster/_core/launcher/default_run_launcher.py index 12c84068ccfbe..4b5cec731ada2 100644 --- a/python_modules/dagster/dagster/_core/launcher/default_run_launcher.py +++ b/python_modules/dagster/dagster/_core/launcher/default_run_launcher.py @@ -100,7 +100,7 @@ def launch_run_from_grpc_client( def launch_run(self, context: LaunchRunContext) -> None: # defer for perf - from dagster._core.host_representation.code_location import ( + from dagster._core.remote_representation.code_location import ( GrpcServerCodeLocation, ) diff --git a/python_modules/dagster/dagster/_core/host_representation/__init__.py b/python_modules/dagster/dagster/_core/remote_representation/__init__.py similarity index 100% rename from python_modules/dagster/dagster/_core/host_representation/__init__.py rename to python_modules/dagster/dagster/_core/remote_representation/__init__.py diff --git a/python_modules/dagster/dagster/_core/host_representation/code_location.py b/python_modules/dagster/dagster/_core/remote_representation/code_location.py similarity index 98% rename from python_modules/dagster/dagster/_core/host_representation/code_location.py rename to python_modules/dagster/dagster/_core/remote_representation/code_location.py index 870e139226efd..b1ad7ead1573e 100644 --- a/python_modules/dagster/dagster/_core/host_representation/code_location.py +++ b/python_modules/dagster/dagster/_core/remote_representation/code_location.py @@ -27,30 +27,30 @@ from dagster._core.errors import DagsterInvariantViolationError, DagsterUserCodeProcessError from dagster._core.execution.api import create_execution_plan from dagster._core.execution.plan.state import KnownExecutionState -from dagster._core.host_representation import ExternalJobSubsetResult -from dagster._core.host_representation.external import ( +from dagster._core.instance import DagsterInstance +from dagster._core.libraries import DagsterLibraryRegistry +from dagster._core.origin import RepositoryPythonOrigin +from dagster._core.remote_representation import ExternalJobSubsetResult +from dagster._core.remote_representation.external import ( ExternalExecutionPlan, ExternalJob, ExternalPartitionSet, ExternalRepository, ) -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( ExternalPartitionNamesData, ExternalScheduleExecutionErrorData, ExternalSensorExecutionErrorData, external_partition_set_name_for_job_name, external_repository_data_from_def, ) -from dagster._core.host_representation.grpc_server_registry import GrpcServerRegistry -from dagster._core.host_representation.handle import JobHandle, RepositoryHandle -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.grpc_server_registry import GrpcServerRegistry +from dagster._core.remote_representation.handle import JobHandle, RepositoryHandle +from dagster._core.remote_representation.origin import ( CodeLocationOrigin, GrpcServerCodeLocationOrigin, InProcessCodeLocationOrigin, ) -from dagster._core.instance import DagsterInstance -from dagster._core.libraries import DagsterLibraryRegistry -from dagster._core.origin import RepositoryPythonOrigin from dagster._core.snap.execution_plan_snapshot import snapshot_from_execution_plan from dagster._grpc.impl import ( get_external_schedule_execution, @@ -69,7 +69,7 @@ if TYPE_CHECKING: from dagster._core.definitions.schedule_definition import ScheduleExecutionData from dagster._core.definitions.sensor_definition import SensorExecutionData - from dagster._core.host_representation import ( + from dagster._core.remote_representation import ( ExternalPartitionConfigData, ExternalPartitionExecutionErrorData, ExternalPartitionSetExecutionParamData, diff --git a/python_modules/dagster/dagster/_core/host_representation/external.py b/python_modules/dagster/dagster/_core/remote_representation/external.py similarity index 99% rename from python_modules/dagster/dagster/_core/host_representation/external.py rename to python_modules/dagster/dagster/_core/remote_representation/external.py index be41ef0208b7c..ad3dd073a5680 100644 --- a/python_modules/dagster/dagster/_core/host_representation/external.py +++ b/python_modules/dagster/dagster/_core/remote_representation/external.py @@ -36,14 +36,14 @@ SensorType, ) from dagster._core.execution.plan.handle import ResolvedFromDynamicStepHandle, StepHandle -from dagster._core.host_representation.origin import ( +from dagster._core.instance import DagsterInstance +from dagster._core.origin import JobPythonOrigin, RepositoryPythonOrigin +from dagster._core.remote_representation.origin import ( ExternalInstigatorOrigin, ExternalJobOrigin, ExternalPartitionSetOrigin, ExternalRepositoryOrigin, ) -from dagster._core.instance import DagsterInstance -from dagster._core.origin import JobPythonOrigin, RepositoryPythonOrigin from dagster._core.snap import ExecutionPlanSnapshot from dagster._core.utils import toposort from dagster._serdes import create_snapshot_id diff --git a/python_modules/dagster/dagster/_core/host_representation/external_data.py b/python_modules/dagster/dagster/_core/remote_representation/external_data.py similarity index 100% rename from python_modules/dagster/dagster/_core/host_representation/external_data.py rename to python_modules/dagster/dagster/_core/remote_representation/external_data.py diff --git a/python_modules/dagster/dagster/_core/host_representation/feature_flags.py b/python_modules/dagster/dagster/_core/remote_representation/feature_flags.py similarity index 100% rename from python_modules/dagster/dagster/_core/host_representation/feature_flags.py rename to python_modules/dagster/dagster/_core/remote_representation/feature_flags.py diff --git a/python_modules/dagster/dagster/_core/host_representation/grpc_server_registry.py b/python_modules/dagster/dagster/_core/remote_representation/grpc_server_registry.py similarity index 99% rename from python_modules/dagster/dagster/_core/host_representation/grpc_server_registry.py rename to python_modules/dagster/dagster/_core/remote_representation/grpc_server_registry.py index 62ee577ccbe40..34456a411428a 100644 --- a/python_modules/dagster/dagster/_core/host_representation/grpc_server_registry.py +++ b/python_modules/dagster/dagster/_core/remote_representation/grpc_server_registry.py @@ -18,11 +18,11 @@ import dagster._check as check from dagster._core.errors import DagsterUserCodeProcessError, DagsterUserCodeUnreachableError -from dagster._core.host_representation.origin import ( +from dagster._core.instance import InstanceRef +from dagster._core.remote_representation.origin import ( CodeLocationOrigin, ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.instance import InstanceRef from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._grpc.server import GrpcServerProcess from dagster._utils.error import SerializableErrorInfo, serializable_error_info_from_exc_info diff --git a/python_modules/dagster/dagster/_core/host_representation/grpc_server_state_subscriber.py b/python_modules/dagster/dagster/_core/remote_representation/grpc_server_state_subscriber.py similarity index 100% rename from python_modules/dagster/dagster/_core/host_representation/grpc_server_state_subscriber.py rename to python_modules/dagster/dagster/_core/remote_representation/grpc_server_state_subscriber.py diff --git a/python_modules/dagster/dagster/_core/host_representation/handle.py b/python_modules/dagster/dagster/_core/remote_representation/handle.py similarity index 94% rename from python_modules/dagster/dagster/_core/host_representation/handle.py rename to python_modules/dagster/dagster/_core/remote_representation/handle.py index 171a8d8c9192b..6047ca4410b07 100644 --- a/python_modules/dagster/dagster/_core/host_representation/handle.py +++ b/python_modules/dagster/dagster/_core/remote_representation/handle.py @@ -2,14 +2,14 @@ import dagster._check as check from dagster._core.definitions.selector import JobSubsetSelector -from dagster._core.host_representation.origin import ( +from dagster._core.origin import RepositoryPythonOrigin +from dagster._core.remote_representation.origin import ( CodeLocationOrigin, ExternalRepositoryOrigin, ) -from dagster._core.origin import RepositoryPythonOrigin if TYPE_CHECKING: - from dagster._core.host_representation.code_location import CodeLocation + from dagster._core.remote_representation.code_location import CodeLocation class RepositoryHandle( @@ -24,7 +24,7 @@ class RepositoryHandle( ) ): def __new__(cls, repository_name: str, code_location: "CodeLocation"): - from dagster._core.host_representation.code_location import CodeLocation + from dagster._core.remote_representation.code_location import CodeLocation check.inst_param(code_location, "code_location", CodeLocation) return super(RepositoryHandle, cls).__new__( diff --git a/python_modules/dagster/dagster/_core/host_representation/historical.py b/python_modules/dagster/dagster/_core/remote_representation/historical.py similarity index 100% rename from python_modules/dagster/dagster/_core/host_representation/historical.py rename to python_modules/dagster/dagster/_core/remote_representation/historical.py diff --git a/python_modules/dagster/dagster/_core/host_representation/job_index.py b/python_modules/dagster/dagster/_core/remote_representation/job_index.py similarity index 100% rename from python_modules/dagster/dagster/_core/host_representation/job_index.py rename to python_modules/dagster/dagster/_core/remote_representation/job_index.py diff --git a/python_modules/dagster/dagster/_core/host_representation/origin.py b/python_modules/dagster/dagster/_core/remote_representation/origin.py similarity index 98% rename from python_modules/dagster/dagster/_core/host_representation/origin.py rename to python_modules/dagster/dagster/_core/remote_representation/origin.py index e717c07f17de2..3f1401e53e777 100644 --- a/python_modules/dagster/dagster/_core/host_representation/origin.py +++ b/python_modules/dagster/dagster/_core/remote_representation/origin.py @@ -31,12 +31,12 @@ ) if TYPE_CHECKING: - from dagster._core.host_representation.code_location import ( + from dagster._core.instance import DagsterInstance + from dagster._core.remote_representation.code_location import ( CodeLocation, GrpcServerCodeLocation, InProcessCodeLocation, ) - from dagster._core.instance import DagsterInstance from dagster._grpc.client import DagsterGrpcClient # This is a hard-coded name for the special "in-process" location. @@ -199,7 +199,7 @@ def get_display_metadata(self) -> Mapping[str, Any]: return {} def create_location(self, instance: "DagsterInstance") -> "InProcessCodeLocation": - from dagster._core.host_representation.code_location import ( + from dagster._core.remote_representation.code_location import ( InProcessCodeLocation, ) @@ -347,7 +347,7 @@ def get_display_metadata(self) -> Mapping[str, str]: return {key: value for key, value in metadata.items() if value is not None} def reload_location(self, instance: "DagsterInstance") -> "GrpcServerCodeLocation": - from dagster._core.host_representation.code_location import ( + from dagster._core.remote_representation.code_location import ( GrpcServerCodeLocation, ) @@ -366,7 +366,7 @@ def reload_location(self, instance: "DagsterInstance") -> "GrpcServerCodeLocatio return GrpcServerCodeLocation(self, instance=instance) def create_location(self, instance: "DagsterInstance") -> "GrpcServerCodeLocation": - from dagster._core.host_representation.code_location import ( + from dagster._core.remote_representation.code_location import ( GrpcServerCodeLocation, ) diff --git a/python_modules/dagster/dagster/_core/host_representation/represented.py b/python_modules/dagster/dagster/_core/remote_representation/represented.py similarity index 100% rename from python_modules/dagster/dagster/_core/host_representation/represented.py rename to python_modules/dagster/dagster/_core/remote_representation/represented.py diff --git a/python_modules/dagster/dagster/_core/scheduler/instigation.py b/python_modules/dagster/dagster/_core/scheduler/instigation.py index 6403379970d01..cece75f7e88bc 100644 --- a/python_modules/dagster/dagster/_core/scheduler/instigation.py +++ b/python_modules/dagster/dagster/_core/scheduler/instigation.py @@ -22,7 +22,7 @@ ) from dagster._core.definitions.selector import InstigatorSelector, RepositorySelector from dagster._core.definitions.sensor_definition import SensorType -from dagster._core.host_representation.origin import ExternalInstigatorOrigin +from dagster._core.remote_representation.origin import ExternalInstigatorOrigin from dagster._serdes import create_snapshot_id from dagster._serdes.errors import DeserializationError from dagster._serdes.serdes import ( diff --git a/python_modules/dagster/dagster/_core/scheduler/scheduler.py b/python_modules/dagster/dagster/_core/scheduler/scheduler.py index e0ffa98c66c42..30a3e9fcae16f 100644 --- a/python_modules/dagster/dagster/_core/scheduler/scheduler.py +++ b/python_modules/dagster/dagster/_core/scheduler/scheduler.py @@ -8,8 +8,8 @@ from dagster._config import Field, IntSource from dagster._core.definitions.run_request import InstigatorType from dagster._core.errors import DagsterError -from dagster._core.host_representation import ExternalSchedule from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalSchedule from dagster._core.scheduler.instigation import ( InstigatorState, InstigatorStatus, diff --git a/python_modules/dagster/dagster/_core/snap/mode.py b/python_modules/dagster/dagster/_core/snap/mode.py index 9fced30d51a38..f1dcd83c96e35 100644 --- a/python_modules/dagster/dagster/_core/snap/mode.py +++ b/python_modules/dagster/dagster/_core/snap/mode.py @@ -9,7 +9,7 @@ def build_mode_def_snap(job_def: JobDefinition) -> "ModeDefSnap": - from dagster._core.host_representation.external_data import DEFAULT_MODE_NAME + from dagster._core.remote_representation.external_data import DEFAULT_MODE_NAME check.inst_param(job_def, "job_def", JobDefinition) diff --git a/python_modules/dagster/dagster/_core/storage/dagster_run.py b/python_modules/dagster/dagster/_core/storage/dagster_run.py index c3b8b2a0fba9e..cf125de4f93ae 100644 --- a/python_modules/dagster/dagster/_core/storage/dagster_run.py +++ b/python_modules/dagster/dagster/_core/storage/dagster_run.py @@ -37,8 +37,8 @@ ) if TYPE_CHECKING: - from dagster._core.host_representation.external import ExternalSchedule, ExternalSensor - from dagster._core.host_representation.origin import ExternalJobOrigin + from dagster._core.remote_representation.external import ExternalSchedule, ExternalSensor + from dagster._core.remote_representation.origin import ExternalJobOrigin @whitelist_for_serdes(storage_name="PipelineRunStatus") @@ -334,7 +334,7 @@ def __new__( # Placing this with the other imports causes a cyclic import # https://github.com/dagster-io/dagster/issues/3181 - from dagster._core.host_representation.origin import ExternalJobOrigin + from dagster._core.remote_representation.origin import ExternalJobOrigin if status == DagsterRunStatus.QUEUED: check.inst_param( @@ -385,7 +385,7 @@ def with_status(self, status: DagsterRunStatus) -> Self: if status == DagsterRunStatus.QUEUED: # Placing this with the other imports causes a cyclic import # https://github.com/dagster-io/dagster/issues/3181 - from dagster._core.host_representation.origin import ExternalJobOrigin + from dagster._core.remote_representation.origin import ExternalJobOrigin check.inst( self.external_job_origin, @@ -396,7 +396,7 @@ def with_status(self, status: DagsterRunStatus) -> Self: return self._replace(status=status) def with_job_origin(self, origin: "ExternalJobOrigin") -> Self: - from dagster._core.host_representation.origin import ExternalJobOrigin + from dagster._core.remote_representation.origin import ExternalJobOrigin check.inst_param(origin, "origin", ExternalJobOrigin) return self._replace(external_job_origin=origin) diff --git a/python_modules/dagster/dagster/_core/storage/legacy_storage.py b/python_modules/dagster/dagster/_core/storage/legacy_storage.py index 4c2425ff8f4a4..88f299ba24769 100644 --- a/python_modules/dagster/dagster/_core/storage/legacy_storage.py +++ b/python_modules/dagster/dagster/_core/storage/legacy_storage.py @@ -46,8 +46,8 @@ from dagster._core.events.log import EventLogEntry from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill from dagster._core.execution.stats import RunStepKeyStatsSnapshot - from dagster._core.host_representation.origin import ExternalJobOrigin from dagster._core.instance import DagsterInstance + from dagster._core.remote_representation.origin import ExternalJobOrigin from dagster._core.scheduler.instigation import ( AutoMaterializeAssetEvaluationRecord, InstigatorState, diff --git a/python_modules/dagster/dagster/_core/storage/runs/base.py b/python_modules/dagster/dagster/_core/storage/runs/base.py index a73af65bf79d0..3f03dda7341bf 100644 --- a/python_modules/dagster/dagster/_core/storage/runs/base.py +++ b/python_modules/dagster/dagster/_core/storage/runs/base.py @@ -22,7 +22,7 @@ from ..daemon_cursor import DaemonCursorStorage if TYPE_CHECKING: - from dagster._core.host_representation.origin import ExternalJobOrigin + from dagster._core.remote_representation.origin import ExternalJobOrigin class RunGroupInfo(TypedDict): diff --git a/python_modules/dagster/dagster/_core/storage/runs/sql_run_storage.py b/python_modules/dagster/dagster/_core/storage/runs/sql_run_storage.py index b6918ccf31069..23f77118fc624 100644 --- a/python_modules/dagster/dagster/_core/storage/runs/sql_run_storage.py +++ b/python_modules/dagster/dagster/_core/storage/runs/sql_run_storage.py @@ -40,7 +40,7 @@ RunFailureReason, ) from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill -from dagster._core.host_representation.origin import ExternalJobOrigin +from dagster._core.remote_representation.origin import ExternalJobOrigin from dagster._core.snap import ( ExecutionPlanSnapshot, JobSnapshot, diff --git a/python_modules/dagster/dagster/_core/telemetry.py b/python_modules/dagster/dagster/_core/telemetry.py index 8b9c9f2d9aefb..ffee6853bd883 100644 --- a/python_modules/dagster/dagster/_core/telemetry.py +++ b/python_modules/dagster/dagster/_core/telemetry.py @@ -56,7 +56,7 @@ from dagster.version import __version__ as dagster_module_version if TYPE_CHECKING: - from dagster._core.host_representation.external import ( + from dagster._core.remote_representation.external import ( ExternalJob, ExternalRepository, ExternalResource, @@ -461,7 +461,7 @@ def hash_name(name: str) -> str: def get_stats_from_external_repo(external_repo: "ExternalRepository") -> Mapping[str, str]: - from dagster._core.host_representation.external_data import ( + from dagster._core.remote_representation.external_data import ( ExternalDynamicPartitionsDefinitionData, ExternalMultiPartitionsDefinitionData, ) @@ -595,7 +595,7 @@ def log_external_repo_stats( external_repo: "ExternalRepository", external_job: Optional["ExternalJob"] = None, ): - from dagster._core.host_representation.external import ExternalJob, ExternalRepository + from dagster._core.remote_representation.external import ExternalJob, ExternalRepository check.inst_param(instance, "instance", DagsterInstance) check.str_param(source, "source") diff --git a/python_modules/dagster/dagster/_core/test_utils.py b/python_modules/dagster/dagster/_core/test_utils.py index 339201ba8b38b..17ce5730116d1 100644 --- a/python_modules/dagster/dagster/_core/test_utils.py +++ b/python_modules/dagster/dagster/_core/test_utils.py @@ -50,12 +50,12 @@ from dagster._core.definitions.unresolved_asset_job_definition import define_asset_job from dagster._core.errors import DagsterUserCodeUnreachableError from dagster._core.events import DagsterEvent -from dagster._core.host_representation.origin import ( +from dagster._core.instance import DagsterInstance +from dagster._core.launcher import RunLauncher +from dagster._core.remote_representation.origin import ( ExternalJobOrigin, InProcessCodeLocationOrigin, ) -from dagster._core.instance import DagsterInstance -from dagster._core.launcher import RunLauncher from dagster._core.run_coordinator import RunCoordinator, SubmitRunContext from dagster._core.secrets import SecretsLoader from dagster._core.storage.dagster_run import DagsterRun, DagsterRunStatus, RunsFilter diff --git a/python_modules/dagster/dagster/_core/workspace/context.py b/python_modules/dagster/dagster/_core/workspace/context.py index 44a9622ae9f47..27fb7ce71adae 100644 --- a/python_modules/dagster/dagster/_core/workspace/context.py +++ b/python_modules/dagster/dagster/_core/workspace/context.py @@ -17,7 +17,8 @@ DagsterCodeLocationNotFoundError, ) from dagster._core.execution.plan.state import KnownExecutionState -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ( CodeLocation, CodeLocationOrigin, ExternalExecutionPlan, @@ -26,19 +27,18 @@ GrpcServerCodeLocation, RepositoryHandle, ) -from dagster._core.host_representation.grpc_server_registry import ( +from dagster._core.remote_representation.grpc_server_registry import ( GrpcServerRegistry, ) -from dagster._core.host_representation.grpc_server_state_subscriber import ( +from dagster._core.remote_representation.grpc_server_state_subscriber import ( LocationStateChangeEvent, LocationStateChangeEventType, LocationStateSubscriber, ) -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.origin import ( GrpcServerCodeLocationOrigin, ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.instance import DagsterInstance from dagster._utils.error import SerializableErrorInfo, serializable_error_info_from_exc_info from .load_target import WorkspaceLoadTarget @@ -56,7 +56,7 @@ ) if TYPE_CHECKING: - from dagster._core.host_representation import ( + from dagster._core.remote_representation import ( ExternalPartitionConfigData, ExternalPartitionExecutionErrorData, ExternalPartitionNamesData, diff --git a/python_modules/dagster/dagster/_core/workspace/load.py b/python_modules/dagster/dagster/_core/workspace/load.py index 3d44c735f72d5..9b8ccad70d5e9 100644 --- a/python_modules/dagster/dagster/_core/workspace/load.py +++ b/python_modules/dagster/dagster/_core/workspace/load.py @@ -4,12 +4,12 @@ import dagster._check as check from dagster._core.code_pointer import rebase_file -from dagster._core.host_representation.origin import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.origin import ( CodeLocationOrigin, GrpcServerCodeLocationOrigin, ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.instance import DagsterInstance from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._utils.yaml_utils import load_yaml_from_path diff --git a/python_modules/dagster/dagster/_core/workspace/load_target.py b/python_modules/dagster/dagster/_core/workspace/load_target.py index e5960bcc25fe3..64e4dd6e4bac3 100644 --- a/python_modules/dagster/dagster/_core/workspace/load_target.py +++ b/python_modules/dagster/dagster/_core/workspace/load_target.py @@ -4,7 +4,7 @@ import tomli -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.origin import ( CodeLocationOrigin, GrpcServerCodeLocationOrigin, ManagedGrpcPythonEnvCodeLocationOrigin, diff --git a/python_modules/dagster/dagster/_core/workspace/workspace.py b/python_modules/dagster/dagster/_core/workspace/workspace.py index 4cb050376cf08..e5f52b4ebc531 100644 --- a/python_modules/dagster/dagster/_core/workspace/workspace.py +++ b/python_modules/dagster/dagster/_core/workspace/workspace.py @@ -5,7 +5,7 @@ from dagster._utils.error import SerializableErrorInfo if TYPE_CHECKING: - from dagster._core.host_representation import CodeLocation, CodeLocationOrigin + from dagster._core.remote_representation import CodeLocation, CodeLocationOrigin # For locations that are loaded asynchronously diff --git a/python_modules/dagster/dagster/_daemon/asset_daemon.py b/python_modules/dagster/dagster/_daemon/asset_daemon.py index f501d379f4f6b..1a639a672fb1f 100644 --- a/python_modules/dagster/dagster/_daemon/asset_daemon.py +++ b/python_modules/dagster/dagster/_daemon/asset_daemon.py @@ -37,12 +37,12 @@ DagsterUserCodeUnreachableError, ) from dagster._core.execution.submit_asset_runs import submit_asset_run -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ( ExternalSensor, ) -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.origin import ExternalInstigatorOrigin -from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.origin import ExternalInstigatorOrigin from dagster._core.scheduler.instigation import ( InstigatorState, InstigatorStatus, diff --git a/python_modules/dagster/dagster/_daemon/controller.py b/python_modules/dagster/dagster/_daemon/controller.py index 4bc797b54c43c..1ba73affa97cb 100644 --- a/python_modules/dagster/dagster/_daemon/controller.py +++ b/python_modules/dagster/dagster/_daemon/controller.py @@ -12,8 +12,8 @@ from typing_extensions import Self import dagster._check as check -from dagster._core.host_representation.grpc_server_registry import GrpcServerRegistry from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.grpc_server_registry import GrpcServerRegistry from dagster._core.workspace.context import IWorkspaceProcessContext, WorkspaceProcessContext from dagster._core.workspace.load_target import WorkspaceLoadTarget from dagster._daemon.asset_daemon import AssetDaemon diff --git a/python_modules/dagster/dagster/_daemon/sensor.py b/python_modules/dagster/dagster/_daemon/sensor.py index e329b0be423b5..6c34a801e6a83 100644 --- a/python_modules/dagster/dagster/_daemon/sensor.py +++ b/python_modules/dagster/dagster/_daemon/sensor.py @@ -37,10 +37,10 @@ ) from dagster._core.definitions.utils import validate_tags from dagster._core.errors import DagsterError -from dagster._core.host_representation.code_location import CodeLocation -from dagster._core.host_representation.external import ExternalJob, ExternalSensor -from dagster._core.host_representation.external_data import ExternalTargetData from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.code_location import CodeLocation +from dagster._core.remote_representation.external import ExternalJob, ExternalSensor +from dagster._core.remote_representation.external_data import ExternalTargetData from dagster._core.scheduler.instigation import ( DynamicPartitionsRequestResult, InstigatorState, diff --git a/python_modules/dagster/dagster/_daemon/workspace.py b/python_modules/dagster/dagster/_daemon/workspace.py index a66c55c36a3ed..6aff502dfc289 100644 --- a/python_modules/dagster/dagster/_daemon/workspace.py +++ b/python_modules/dagster/dagster/_daemon/workspace.py @@ -2,7 +2,7 @@ from typing import Mapping, Sequence from dagster._core.errors import DagsterCodeLocationLoadError -from dagster._core.host_representation.code_location import ( +from dagster._core.remote_representation.code_location import ( CodeLocation, ) from dagster._core.workspace.workspace import ( diff --git a/python_modules/dagster/dagster/_grpc/client.py b/python_modules/dagster/dagster/_grpc/client.py index a0a700b6f2af0..9dc04c9d27d0a 100644 --- a/python_modules/dagster/dagster/_grpc/client.py +++ b/python_modules/dagster/dagster/_grpc/client.py @@ -13,8 +13,8 @@ import dagster._seven as seven from dagster._core.errors import DagsterUserCodeUnreachableError from dagster._core.events import EngineEventData -from dagster._core.host_representation.origin import ExternalRepositoryOrigin from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.origin import ExternalRepositoryOrigin from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._serdes import serialize_value from dagster._utils.error import serializable_error_info_from_exc_info diff --git a/python_modules/dagster/dagster/_grpc/impl.py b/python_modules/dagster/dagster/_grpc/impl.py index 6c75cf43a4f07..b12183e9878c4 100644 --- a/python_modules/dagster/dagster/_grpc/impl.py +++ b/python_modules/dagster/dagster/_grpc/impl.py @@ -41,8 +41,10 @@ ) from dagster._core.events import DagsterEvent, EngineEventData from dagster._core.execution.api import create_execution_plan, execute_run_iterator -from dagster._core.host_representation import external_job_data_from_def -from dagster._core.host_representation.external_data import ( +from dagster._core.instance import DagsterInstance +from dagster._core.instance.ref import InstanceRef +from dagster._core.remote_representation import external_job_data_from_def +from dagster._core.remote_representation.external_data import ( ExternalJobSubsetResult, ExternalPartitionConfigData, ExternalPartitionExecutionErrorData, @@ -54,8 +56,6 @@ ExternalSensorExecutionErrorData, job_name_for_external_partition_set_name, ) -from dagster._core.instance import DagsterInstance -from dagster._core.instance.ref import InstanceRef from dagster._core.snap.execution_plan_snapshot import ( ExecutionPlanSnapshotErrorData, snapshot_from_execution_plan, diff --git a/python_modules/dagster/dagster/_grpc/proxy_server.py b/python_modules/dagster/dagster/_grpc/proxy_server.py index 8d93bc05dc800..7ca872651054f 100644 --- a/python_modules/dagster/dagster/_grpc/proxy_server.py +++ b/python_modules/dagster/dagster/_grpc/proxy_server.py @@ -5,11 +5,11 @@ from typing import TYPE_CHECKING, Dict, Optional import dagster._check as check -from dagster._core.host_representation.grpc_server_registry import GrpcServerRegistry -from dagster._core.host_representation.origin import ( +from dagster._core.instance import InstanceRef +from dagster._core.remote_representation.grpc_server_registry import GrpcServerRegistry +from dagster._core.remote_representation.origin import ( ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.instance import InstanceRef from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._grpc.client import DEFAULT_GRPC_TIMEOUT from dagster._grpc.types import ( diff --git a/python_modules/dagster/dagster/_grpc/server.py b/python_modules/dagster/dagster/_grpc/server.py index 42a6b9b41c47f..fc766ab7d467d 100644 --- a/python_modules/dagster/dagster/_grpc/server.py +++ b/python_modules/dagster/dagster/_grpc/server.py @@ -42,7 +42,10 @@ DagsterUserCodeUnreachableError, user_code_error_boundary, ) -from dagster._core.host_representation.external_data import ( +from dagster._core.instance import DagsterInstance, InstanceRef +from dagster._core.libraries import DagsterLibraryRegistry +from dagster._core.origin import DEFAULT_DAGSTER_ENTRY_POINT, get_python_environment_entry_point +from dagster._core.remote_representation.external_data import ( ExternalJobSubsetResult, ExternalPartitionExecutionErrorData, ExternalRepositoryErrorData, @@ -51,10 +54,7 @@ external_job_data_from_def, external_repository_data_from_def, ) -from dagster._core.host_representation.origin import ExternalRepositoryOrigin -from dagster._core.instance import DagsterInstance, InstanceRef -from dagster._core.libraries import DagsterLibraryRegistry -from dagster._core.origin import DEFAULT_DAGSTER_ENTRY_POINT, get_python_environment_entry_point +from dagster._core.remote_representation.origin import ExternalRepositoryOrigin from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._core.utils import FuturesAwareThreadPoolExecutor, RequestUtilizationMetrics from dagster._core.workspace.autodiscovery import LoadableTarget diff --git a/python_modules/dagster/dagster/_grpc/types.py b/python_modules/dagster/dagster/_grpc/types.py index 1f260646762d5..38f210f960d1f 100644 --- a/python_modules/dagster/dagster/_grpc/types.py +++ b/python_modules/dagster/dagster/_grpc/types.py @@ -8,14 +8,14 @@ from dagster._core.definitions.events import AssetKey from dagster._core.execution.plan.state import KnownExecutionState from dagster._core.execution.retries import RetryMode -from dagster._core.host_representation.external_data import DEFAULT_MODE_NAME -from dagster._core.host_representation.origin import ( +from dagster._core.instance.ref import InstanceRef +from dagster._core.origin import JobPythonOrigin, get_python_environment_entry_point +from dagster._core.remote_representation.external_data import DEFAULT_MODE_NAME +from dagster._core.remote_representation.origin import ( CodeLocationOrigin, ExternalJobOrigin, ExternalRepositoryOrigin, ) -from dagster._core.instance.ref import InstanceRef -from dagster._core.origin import JobPythonOrigin, get_python_environment_entry_point from dagster._serdes import serialize_value, whitelist_for_serdes from dagster._serdes.serdes import SetToSequenceFieldSerializer from dagster._utils.error import SerializableErrorInfo diff --git a/python_modules/dagster/dagster/_scheduler/scheduler.py b/python_modules/dagster/dagster/_scheduler/scheduler.py index 18e00349aa7c0..1dba48343b3f2 100644 --- a/python_modules/dagster/dagster/_scheduler/scheduler.py +++ b/python_modules/dagster/dagster/_scheduler/scheduler.py @@ -19,10 +19,10 @@ DagsterCodeLocationLoadError, DagsterUserCodeUnreachableError, ) -from dagster._core.host_representation import ExternalSchedule -from dagster._core.host_representation.code_location import CodeLocation -from dagster._core.host_representation.external import ExternalJob from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalSchedule +from dagster._core.remote_representation.code_location import CodeLocation +from dagster._core.remote_representation.external import ExternalJob from dagster._core.scheduler.instigation import ( InstigatorState, InstigatorStatus, diff --git a/python_modules/dagster/dagster/_scheduler/stale.py b/python_modules/dagster/dagster/_scheduler/stale.py index d4080b9f4aa87..6b4860ce8daf3 100644 --- a/python_modules/dagster/dagster/_scheduler/stale.py +++ b/python_modules/dagster/dagster/_scheduler/stale.py @@ -8,7 +8,7 @@ from dagster._core.definitions.events import AssetKey from dagster._core.definitions.remote_asset_graph import RemoteAssetGraph from dagster._core.definitions.run_request import RunRequest -from dagster._core.host_representation.external import ( +from dagster._core.remote_representation.external import ( ExternalSchedule, ExternalSensor, ) diff --git a/python_modules/dagster/dagster/_utils/alert.py b/python_modules/dagster/dagster/_utils/alert.py index da8f4f1272f56..0e2fc2ff1d799 100644 --- a/python_modules/dagster/dagster/_utils/alert.py +++ b/python_modules/dagster/dagster/_utils/alert.py @@ -18,7 +18,7 @@ def _default_failure_email_body(context: "RunFailureSensorContext") -> str: - from dagster._core.host_representation.external_data import DEFAULT_MODE_NAME + from dagster._core.remote_representation.external_data import DEFAULT_MODE_NAME return "
".join( [ diff --git a/python_modules/dagster/dagster/_utils/external.py b/python_modules/dagster/dagster/_utils/external.py index 8641a6d9ec6cc..5f89696fcd7dd 100644 --- a/python_modules/dagster/dagster/_utils/external.py +++ b/python_modules/dagster/dagster/_utils/external.py @@ -2,9 +2,9 @@ import dagster._check as check from dagster._core.definitions.selector import JobSubsetSelector -from dagster._core.host_representation import CodeLocation -from dagster._core.host_representation.external import ExternalJob -from dagster._core.host_representation.origin import ExternalJobOrigin +from dagster._core.remote_representation import CodeLocation +from dagster._core.remote_representation.external import ExternalJob +from dagster._core.remote_representation.origin import ExternalJobOrigin def external_job_from_location( diff --git a/python_modules/dagster/dagster/_utils/hosted_user_process.py b/python_modules/dagster/dagster/_utils/hosted_user_process.py index 0d696e3337bd9..b7865450ea5cc 100644 --- a/python_modules/dagster/dagster/_utils/hosted_user_process.py +++ b/python_modules/dagster/dagster/_utils/hosted_user_process.py @@ -10,11 +10,11 @@ import dagster._check as check from dagster._core.definitions.reconstruct import ReconstructableJob, ReconstructableRepository -from dagster._core.host_representation import ExternalJob -from dagster._core.host_representation.external_data import ( +from dagster._core.origin import JobPythonOrigin, RepositoryPythonOrigin +from dagster._core.remote_representation import ExternalJob +from dagster._core.remote_representation.external_data import ( external_job_data_from_def, ) -from dagster._core.origin import JobPythonOrigin, RepositoryPythonOrigin def recon_job_from_origin(origin: JobPythonOrigin) -> ReconstructableJob: diff --git a/python_modules/dagster/dagster/_utils/test/schedule_storage.py b/python_modules/dagster/dagster/_utils/test/schedule_storage.py index 3fdb57ac1ef41..831bc6eb29d47 100644 --- a/python_modules/dagster/dagster/_utils/test/schedule_storage.py +++ b/python_modules/dagster/dagster/_utils/test/schedule_storage.py @@ -13,7 +13,7 @@ from dagster._core.definitions.asset_subset import AssetSubset from dagster._core.definitions.events import AssetKey from dagster._core.definitions.metadata import MetadataValue -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( ExternalRepositoryOrigin, ManagedGrpcPythonEnvCodeLocationOrigin, ) diff --git a/python_modules/dagster/dagster_tests/api_tests/test_api_get_current_runs.py b/python_modules/dagster/dagster_tests/api_tests/test_api_get_current_runs.py index 279149102efa8..3148d2059d34c 100644 --- a/python_modules/dagster/dagster_tests/api_tests/test_api_get_current_runs.py +++ b/python_modules/dagster/dagster_tests/api_tests/test_api_get_current_runs.py @@ -1,6 +1,6 @@ import time -from dagster._core.host_representation.handle import JobHandle +from dagster._core.remote_representation.handle import JobHandle from dagster._core.test_utils import create_run_for_test, instance_for_test, poll_for_event from dagster._grpc.server import ExecuteExternalJobArgs from dagster._grpc.types import CancelExecutionRequest, CancelExecutionResult, StartRunResult diff --git a/python_modules/dagster/dagster_tests/api_tests/test_api_launch_run.py b/python_modules/dagster/dagster_tests/api_tests/test_api_launch_run.py index f69edcfa6a071..456c5df65673a 100644 --- a/python_modules/dagster/dagster_tests/api_tests/test_api_launch_run.py +++ b/python_modules/dagster/dagster_tests/api_tests/test_api_launch_run.py @@ -1,4 +1,4 @@ -from dagster._core.host_representation.handle import JobHandle +from dagster._core.remote_representation.handle import JobHandle from dagster._core.storage.dagster_run import DagsterRunStatus from dagster._core.test_utils import ( create_run_for_test, diff --git a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_execution_plan.py b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_execution_plan.py index 44d927ae346fb..f7d4cb1e05036 100644 --- a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_execution_plan.py +++ b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_execution_plan.py @@ -4,8 +4,8 @@ from dagster._api.snapshot_execution_plan import sync_get_external_execution_plan_grpc from dagster._core.definitions.events import AssetKey from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation.handle import JobHandle from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.handle import JobHandle from dagster._core.snap.execution_plan_snapshot import ExecutionPlanSnapshot from .utils import get_bar_repo_code_location diff --git a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_job.py b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_job.py index 6ea5e504e0742..652221c2937f9 100644 --- a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_job.py +++ b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_job.py @@ -3,8 +3,8 @@ import pytest from dagster._api.snapshot_job import sync_get_external_job_subset_grpc from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation.external_data import ExternalJobSubsetResult -from dagster._core.host_representation.handle import JobHandle +from dagster._core.remote_representation.external_data import ExternalJobSubsetResult +from dagster._core.remote_representation.handle import JobHandle from dagster._grpc.types import JobSubsetSnapshotArgs from dagster._serdes import deserialize_value from dagster._utils.error import serializable_error_info_from_exc_info diff --git a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_partition.py b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_partition.py index 37fba7fd6ab4d..a8d15cf2f9d78 100644 --- a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_partition.py +++ b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_partition.py @@ -8,14 +8,14 @@ sync_get_external_partition_tags_grpc, ) from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ( ExternalPartitionConfigData, ExternalPartitionExecutionErrorData, ExternalPartitionNamesData, ExternalPartitionSetExecutionParamData, ExternalPartitionTagsData, ) -from dagster._core.instance import DagsterInstance from dagster._grpc.types import PartitionArgs, PartitionNamesArgs, PartitionSetExecutionParamArgs from dagster._serdes import deserialize_value diff --git a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_repository.py b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_repository.py index 2687e6223b102..d79e30cebbc09 100644 --- a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_repository.py +++ b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_repository.py @@ -7,15 +7,15 @@ sync_get_streaming_external_repositories_data_grpc, ) from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ( ExternalRepositoryData, ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.external_data import ExternalJobData -from dagster._core.host_representation.handle import RepositoryHandle -from dagster._core.host_representation.origin import ExternalRepositoryOrigin -from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.external_data import ExternalJobData +from dagster._core.remote_representation.handle import RepositoryHandle +from dagster._core.remote_representation.origin import ExternalRepositoryOrigin from dagster._core.test_utils import instance_for_test from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._serdes.serdes import deserialize_value diff --git a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_schedule_execution_data.py b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_schedule_execution_data.py index ed6908a301e7d..6d5e311d84417 100644 --- a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_schedule_execution_data.py +++ b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_schedule_execution_data.py @@ -9,7 +9,7 @@ ) from dagster._core.definitions.schedule_definition import ScheduleExecutionData from dagster._core.errors import DagsterUserCodeUnreachableError -from dagster._core.host_representation.external_data import ExternalScheduleExecutionErrorData +from dagster._core.remote_representation.external_data import ExternalScheduleExecutionErrorData from dagster._core.test_utils import instance_for_test from dagster._grpc.client import ephemeral_grpc_api_client from dagster._grpc.types import ExternalScheduleExecutionArgs diff --git a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_sensor.py b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_sensor.py index b54181be40f1b..3b1c596421ec4 100644 --- a/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_sensor.py +++ b/python_modules/dagster/dagster_tests/api_tests/test_api_snapshot_sensor.py @@ -9,7 +9,7 @@ ) from dagster._core.definitions.sensor_definition import SensorExecutionData from dagster._core.errors import DagsterUserCodeProcessError, DagsterUserCodeUnreachableError -from dagster._core.host_representation.external_data import ExternalSensorExecutionErrorData +from dagster._core.remote_representation.external_data import ExternalSensorExecutionErrorData from dagster._grpc.client import ephemeral_grpc_api_client from dagster._grpc.types import SensorExecutionArgs from dagster._serdes import deserialize_value diff --git a/python_modules/dagster/dagster_tests/api_tests/utils.py b/python_modules/dagster/dagster_tests/api_tests/utils.py index 768b13508b428..a06c5a8d15bde 100644 --- a/python_modules/dagster/dagster_tests/api_tests/utils.py +++ b/python_modules/dagster/dagster_tests/api_tests/utils.py @@ -3,13 +3,13 @@ from typing import Iterator, Optional from dagster import file_relative_path -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ( JobHandle, ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.host_representation.code_location import GrpcServerCodeLocation -from dagster._core.host_representation.handle import RepositoryHandle -from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.code_location import GrpcServerCodeLocation +from dagster._core.remote_representation.handle import RepositoryHandle from dagster._core.test_utils import instance_for_test from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._core.workspace.context import WorkspaceProcessContext, WorkspaceRequestContext diff --git a/python_modules/dagster/dagster_tests/asset_defs_tests/test_asset_graph.py b/python_modules/dagster/dagster_tests/asset_defs_tests/test_asset_graph.py index 60ae61e411659..ebbf0980dc7c5 100644 --- a/python_modules/dagster/dagster_tests/asset_defs_tests/test_asset_graph.py +++ b/python_modules/dagster/dagster_tests/asset_defs_tests/test_asset_graph.py @@ -38,11 +38,11 @@ from dagster._core.errors import ( DagsterDefinitionChangedDeserializationError, ) -from dagster._core.host_representation.external_data import ( +from dagster._core.instance import DynamicPartitionsStore +from dagster._core.remote_representation.external_data import ( external_asset_checks_from_defs, external_asset_nodes_from_defs, ) -from dagster._core.instance import DynamicPartitionsStore from dagster._core.test_utils import instance_for_test from dagster._seven.compat.pendulum import create_pendulum_time, pendulum_freeze_time diff --git a/python_modules/dagster/dagster_tests/asset_defs_tests/test_external_asset_graph.py b/python_modules/dagster/dagster_tests/asset_defs_tests/test_external_asset_graph.py index 445172ef9aedb..ffe974a464f88 100644 --- a/python_modules/dagster/dagster_tests/asset_defs_tests/test_external_asset_graph.py +++ b/python_modules/dagster/dagster_tests/asset_defs_tests/test_external_asset_graph.py @@ -22,7 +22,7 @@ from dagster._core.definitions.data_version import CachingStaleStatusResolver from dagster._core.definitions.decorators.source_asset_decorator import observable_source_asset from dagster._core.definitions.remote_asset_graph import RemoteAssetGraph -from dagster._core.host_representation import InProcessCodeLocationOrigin +from dagster._core.remote_representation import InProcessCodeLocationOrigin from dagster._core.test_utils import instance_for_test from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._core.workspace.context import WorkspaceRequestContext diff --git a/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_schedule_commands.py b/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_schedule_commands.py index f8f2787a44358..c1e52722b09fb 100644 --- a/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_schedule_commands.py +++ b/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_schedule_commands.py @@ -13,8 +13,8 @@ schedule_stop_command, schedule_wipe_command, ) -from dagster._core.host_representation import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalRepository from dagster._core.test_utils import environ from .test_cli_commands import schedule_command_contexts, scheduler_instance diff --git a/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_sensor_commands.py b/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_sensor_commands.py index 30879e6a08703..f1fd22f3f831f 100644 --- a/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_sensor_commands.py +++ b/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_sensor_commands.py @@ -12,8 +12,8 @@ sensor_start_command, sensor_stop_command, ) -from dagster._core.host_representation import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalRepository from dagster._core.test_utils import environ from .test_cli_commands import sensor_command_contexts diff --git a/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_telemetry.py b/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_telemetry.py index 74a90df50a328..aea69f0d0f703 100644 --- a/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_telemetry.py +++ b/python_modules/dagster/dagster_tests/cli_tests/command_tests/test_telemetry.py @@ -32,9 +32,9 @@ from dagster._core.definitions.resource_definition import dagster_maintained_resource from dagster._core.execution.context.input import InputContext from dagster._core.execution.context.output import OutputContext -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.external_data import external_repository_data_from_def -from dagster._core.host_representation.handle import RepositoryHandle +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.external_data import external_repository_data_from_def +from dagster._core.remote_representation.handle import RepositoryHandle from dagster._core.storage.io_manager import dagster_maintained_io_manager from dagster._core.telemetry import ( TELEMETRY_STR, diff --git a/python_modules/dagster/dagster_tests/cli_tests/test_api_commands.py b/python_modules/dagster/dagster_tests/cli_tests/test_api_commands.py index aef1ee2f9ab52..f86d18fc56b9f 100644 --- a/python_modules/dagster/dagster_tests/cli_tests/test_api_commands.py +++ b/python_modules/dagster/dagster_tests/cli_tests/test_api_commands.py @@ -8,7 +8,7 @@ from dagster._core.execution.plan.state import KnownExecutionState from dagster._core.execution.retries import RetryState from dagster._core.execution.stats import RunStepKeyStatsSnapshot -from dagster._core.host_representation import JobHandle +from dagster._core.remote_representation import JobHandle from dagster._core.test_utils import ( create_run_for_test, ensure_dagster_tests_import, diff --git a/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/multi_location/test_multi_location_workspace.py b/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/multi_location/test_multi_location_workspace.py index 75f031ae16653..aa7124ac962cf 100644 --- a/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/multi_location/test_multi_location_workspace.py +++ b/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/multi_location/test_multi_location_workspace.py @@ -3,7 +3,7 @@ import pytest import yaml -from dagster._core.host_representation import GrpcServerCodeLocation +from dagster._core.remote_representation import GrpcServerCodeLocation from dagster._core.test_utils import instance_for_test from dagster._core.workspace.context import WorkspaceProcessContext from dagster._core.workspace.load import ( diff --git a/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_grpc_server_workspace.py b/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_grpc_server_workspace.py index 6599f2fc420e4..88d8edd8c186e 100644 --- a/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_grpc_server_workspace.py +++ b/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_grpc_server_workspace.py @@ -5,7 +5,7 @@ from dagster import _seven from dagster._check import CheckError from dagster._core.errors import DagsterUserCodeUnreachableError -from dagster._core.host_representation import GrpcServerCodeLocationOrigin +from dagster._core.remote_representation import GrpcServerCodeLocationOrigin from dagster._core.test_utils import environ, instance_for_test from dagster._core.workspace.load import location_origins_from_config from dagster._grpc.server import GrpcServerProcess diff --git a/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_job_load.py b/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_job_load.py index 528075f0f162b..af73f08c4f5a6 100644 --- a/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_job_load.py +++ b/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_job_load.py @@ -2,8 +2,8 @@ import pytest from click.testing import CliRunner from dagster._cli.workspace.cli_target import get_external_job_from_kwargs, job_target_argument -from dagster._core.host_representation import ExternalJob from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalJob from dagster._core.test_utils import instance_for_test from dagster._utils import file_relative_path diff --git a/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_repository_load.py b/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_repository_load.py index cfebf25410294..dc436c7d2dbc8 100644 --- a/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_repository_load.py +++ b/python_modules/dagster/dagster_tests/cli_tests/workspace_tests/test_repository_load.py @@ -6,8 +6,8 @@ get_workspace_from_kwargs, repository_target_argument, ) -from dagster._core.host_representation import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalRepository from dagster._core.test_utils import instance_for_test from dagster._core.workspace.context import WorkspaceRequestContext from dagster._utils import file_relative_path diff --git a/python_modules/dagster/dagster_tests/core_tests/execution_tests/test_asset_backfill.py b/python_modules/dagster/dagster_tests/core_tests/execution_tests/test_asset_backfill.py index c3951d63dacba..766eb74fd7074 100644 --- a/python_modules/dagster/dagster_tests/core_tests/execution_tests/test_asset_backfill.py +++ b/python_modules/dagster/dagster_tests/core_tests/execution_tests/test_asset_backfill.py @@ -55,7 +55,7 @@ execute_asset_backfill_iteration_inner, get_canceling_asset_backfill_iteration_data, ) -from dagster._core.host_representation.external_data import external_asset_nodes_from_defs +from dagster._core.remote_representation.external_data import external_asset_nodes_from_defs from dagster._core.storage.dagster_run import RunsFilter from dagster._core.storage.tags import ( ASSET_PARTITION_RANGE_END_TAG, @@ -523,7 +523,7 @@ def get_asset_graph( for key in assets_def.keys } with patch( - "dagster._core.host_representation.external_data.get_builtin_partition_mapping_types" + "dagster._core.remote_representation.external_data.get_builtin_partition_mapping_types" ) as get_builtin_partition_mapping_types: get_builtin_partition_mapping_types.return_value = tuple( assets_def.infer_partition_mapping( diff --git a/python_modules/dagster/dagster_tests/core_tests/host_representation_tests/test_external_data.py b/python_modules/dagster/dagster_tests/core_tests/host_representation_tests/test_external_data.py index 9811d7256c2d2..c7ff6795ad134 100644 --- a/python_modules/dagster/dagster_tests/core_tests/host_representation_tests/test_external_data.py +++ b/python_modules/dagster/dagster_tests/core_tests/host_representation_tests/test_external_data.py @@ -35,7 +35,7 @@ from dagster._core.definitions.time_window_partitions import TimeWindowPartitionsDefinition from dagster._core.definitions.utils import DEFAULT_GROUP_NAME from dagster._core.errors import DagsterInvalidDefinitionError -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( ExternalAssetDependedBy, ExternalAssetDependency, ExternalAssetNode, diff --git a/python_modules/dagster/dagster_tests/core_tests/host_representation_tests/test_external_sensor_data.py b/python_modules/dagster/dagster_tests/core_tests/host_representation_tests/test_external_sensor_data.py index bc1b6b3b5793f..8dc7c388ac65d 100644 --- a/python_modules/dagster/dagster_tests/core_tests/host_representation_tests/test_external_sensor_data.py +++ b/python_modules/dagster/dagster_tests/core_tests/host_representation_tests/test_external_sensor_data.py @@ -2,7 +2,7 @@ from dagster import AssetKey, AssetSelection, Definitions, asset, sensor from dagster._core.definitions.base_asset_graph import BaseAssetGraph -from dagster._core.host_representation.external_data import external_sensor_data_from_def +from dagster._core.remote_representation.external_data import external_sensor_data_from_def def test_external_sensor_has_asset_selection(): diff --git a/python_modules/dagster/dagster_tests/core_tests/run_coordinator_tests/test_default_run_coordinator.py b/python_modules/dagster/dagster_tests/core_tests/run_coordinator_tests/test_default_run_coordinator.py index 217c359fb1604..e21f9a18103eb 100644 --- a/python_modules/dagster/dagster_tests/core_tests/run_coordinator_tests/test_default_run_coordinator.py +++ b/python_modules/dagster/dagster_tests/core_tests/run_coordinator_tests/test_default_run_coordinator.py @@ -1,8 +1,8 @@ from typing import Iterator import pytest -from dagster._core.host_representation.external import ExternalJob from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalJob from dagster._core.run_coordinator import SubmitRunContext from dagster._core.run_coordinator.base import RunCoordinator from dagster._core.run_coordinator.default_run_coordinator import DefaultRunCoordinator diff --git a/python_modules/dagster/dagster_tests/core_tests/run_coordinator_tests/test_queued_run_coordinator.py b/python_modules/dagster/dagster_tests/core_tests/run_coordinator_tests/test_queued_run_coordinator.py index 1f08d1859a322..bd7bf1df30968 100644 --- a/python_modules/dagster/dagster_tests/core_tests/run_coordinator_tests/test_queued_run_coordinator.py +++ b/python_modules/dagster/dagster_tests/core_tests/run_coordinator_tests/test_queued_run_coordinator.py @@ -3,8 +3,8 @@ import pytest from dagster._core.errors import DagsterInvalidConfigError from dagster._core.events import DagsterEventType -from dagster._core.host_representation.external import ExternalJob from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalJob from dagster._core.run_coordinator import SubmitRunContext from dagster._core.run_coordinator.queued_run_coordinator import QueuedRunCoordinator from dagster._core.storage.dagster_run import DagsterRun, DagsterRunStatus diff --git a/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_active_data.py b/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_active_data.py index 942853bf9017e..cc5ca87ccb52f 100644 --- a/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_active_data.py +++ b/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_active_data.py @@ -5,11 +5,11 @@ import pendulum from dagster import daily_partitioned_config, job, op, repository from dagster._core.definitions.decorators.schedule_decorator import schedule -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( external_job_data_from_def, external_repository_data_from_def, ) -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( ExternalTimeWindowPartitionsDefinitionData, ) from dagster._core.snap.job_snapshot import create_job_snapshot_id @@ -80,7 +80,7 @@ def test_external_job_data(snapshot): snapshot.assert_match(serialize_pp(external_job_data_from_def(foo_job))) -@mock.patch("dagster._core.host_representation.job_index.create_job_snapshot_id") +@mock.patch("dagster._core.remote_representation.job_index.create_job_snapshot_id") def test_external_repo_shared_index(snapshot_mock): # ensure we don't rebuild indexes / snapshot ids repeatedly @@ -102,7 +102,7 @@ def _fetch_snap_id(): assert snapshot_mock.call_count == 1 -@mock.patch("dagster._core.host_representation.job_index.create_job_snapshot_id") +@mock.patch("dagster._core.remote_representation.job_index.create_job_snapshot_id") def test_external_repo_shared_index_threaded(snapshot_mock): # ensure we don't rebuild indexes / snapshot ids repeatedly across threads diff --git a/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_repository_snap.py b/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_repository_snap.py index 7a17c45701ea9..353cc9b03beda 100644 --- a/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_repository_snap.py +++ b/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_repository_snap.py @@ -26,11 +26,11 @@ from dagster._core.definitions.resource_definition import ResourceDefinition from dagster._core.definitions.unresolved_asset_job_definition import define_asset_job from dagster._core.execution.context.init import InitResourceContext -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( ExternalJobData, external_repository_data_from_def, ) -from dagster._core.host_representation.external_data import ( +from dagster._core.remote_representation.external_data import ( ExternalResourceData, NestedResource, NestedResourceType, diff --git a/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_snap_to_yaml.py b/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_snap_to_yaml.py index b358049700c36..23d2921e442a0 100644 --- a/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_snap_to_yaml.py +++ b/python_modules/dagster/dagster_tests/core_tests/snap_tests/test_snap_to_yaml.py @@ -7,13 +7,13 @@ from dagster._config.field import resolve_to_config_type from dagster._config.snap import ConfigSchemaSnapshot, snap_from_config_type from dagster._core.definitions.definitions_class import Definitions -from dagster._core.host_representation import InProcessCodeLocationOrigin +from dagster._core.remote_representation import InProcessCodeLocationOrigin from dagster._core.snap.snap_to_yaml import default_values_yaml_from_type_snap from dagster._core.test_utils import instance_for_test from dagster._core.types.loadable_target_origin import LoadableTargetOrigin if TYPE_CHECKING: - from dagster._core.host_representation.external import ExternalJob + from dagster._core.remote_representation.external import ExternalJob @pytest.fixture diff --git a/python_modules/dagster/dagster_tests/core_tests/workspace_tests/test_request_context.py b/python_modules/dagster/dagster_tests/core_tests/workspace_tests/test_request_context.py index f183af0d648cd..1758700b5749e 100644 --- a/python_modules/dagster/dagster_tests/core_tests/workspace_tests/test_request_context.py +++ b/python_modules/dagster/dagster_tests/core_tests/workspace_tests/test_request_context.py @@ -7,11 +7,11 @@ DagsterCodeLocationLoadError, DagsterCodeLocationNotFoundError, ) -from dagster._core.host_representation.feature_flags import ( +from dagster._core.remote_representation.feature_flags import ( CodeLocationFeatureFlags, get_feature_flags_for_location, ) -from dagster._core.host_representation.origin import RegisteredCodeLocationOrigin +from dagster._core.remote_representation.origin import RegisteredCodeLocationOrigin from dagster._core.workspace.context import WorkspaceRequestContext from dagster._core.workspace.workspace import ( CodeLocationEntry, diff --git a/python_modules/dagster/dagster_tests/daemon_sensor_tests/conftest.py b/python_modules/dagster/dagster_tests/daemon_sensor_tests/conftest.py index 6a2a7d1b62104..72f19ddb6bb8d 100644 --- a/python_modules/dagster/dagster_tests/daemon_sensor_tests/conftest.py +++ b/python_modules/dagster/dagster_tests/daemon_sensor_tests/conftest.py @@ -3,8 +3,8 @@ from typing import Iterator, Optional import pytest -from dagster._core.host_representation.external import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalRepository from dagster._core.test_utils import ( SingleThreadPoolExecutor, create_test_daemon_workspace_context, diff --git a/python_modules/dagster/dagster_tests/daemon_sensor_tests/test_run_status_sensors.py b/python_modules/dagster/dagster_tests/daemon_sensor_tests/test_run_status_sensors.py index aa64dd7e24cba..46d6093b00c16 100644 --- a/python_modules/dagster/dagster_tests/daemon_sensor_tests/test_run_status_sensors.py +++ b/python_modules/dagster/dagster_tests/daemon_sensor_tests/test_run_status_sensors.py @@ -17,9 +17,9 @@ ) from dagster._core.events import DagsterEvent, DagsterEventType from dagster._core.events.log import EventLogEntry -from dagster._core.host_representation import CodeLocation, ExternalRepository from dagster._core.instance import DagsterInstance from dagster._core.log_manager import LOG_RECORD_METADATA_ATTR +from dagster._core.remote_representation import CodeLocation, ExternalRepository from dagster._core.scheduler.instigation import SensorInstigatorData, TickStatus from dagster._core.storage.event_log.base import EventRecordsFilter from dagster._core.test_utils import create_test_daemon_workspace_context, instance_for_test diff --git a/python_modules/dagster/dagster_tests/daemon_sensor_tests/test_sensor_run.py b/python_modules/dagster/dagster_tests/daemon_sensor_tests/test_sensor_run.py index 8a78357ab1473..45fc62200376e 100644 --- a/python_modules/dagster/dagster_tests/daemon_sensor_tests/test_sensor_run.py +++ b/python_modules/dagster/dagster_tests/daemon_sensor_tests/test_sensor_run.py @@ -56,17 +56,17 @@ SkipReason, ) from dagster._core.events import DagsterEventType -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.log_manager import LOG_RECORD_METADATA_ATTR +from dagster._core.remote_representation import ( ExternalInstigatorOrigin, ExternalRepositoryOrigin, ExternalSensor, ) -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.origin import ( ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.instance import DagsterInstance -from dagster._core.log_manager import LOG_RECORD_METADATA_ATTR from dagster._core.scheduler.instigation import ( DynamicPartitionsRequestResult, InstigatorState, diff --git a/python_modules/dagster/dagster_tests/daemon_tests/conftest.py b/python_modules/dagster/dagster_tests/daemon_tests/conftest.py index e5fd6029c5991..3e2de0275bcbf 100644 --- a/python_modules/dagster/dagster_tests/daemon_tests/conftest.py +++ b/python_modules/dagster/dagster_tests/daemon_tests/conftest.py @@ -4,7 +4,7 @@ import pytest from dagster import DagsterInstance -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( CodeLocation, ExternalRepository, InProcessCodeLocationOrigin, diff --git a/python_modules/dagster/dagster_tests/daemon_tests/test_backfill.py b/python_modules/dagster/dagster_tests/daemon_tests/test_backfill.py index ecfd2d7773cb3..d7a25772de954 100644 --- a/python_modules/dagster/dagster_tests/daemon_tests/test_backfill.py +++ b/python_modules/dagster/dagster_tests/daemon_tests/test_backfill.py @@ -50,7 +50,7 @@ ) from dagster._core.execution.asset_backfill import RUN_CHUNK_SIZE from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( ExternalRepository, ExternalRepositoryOrigin, InProcessCodeLocationOrigin, diff --git a/python_modules/dagster/dagster_tests/daemon_tests/test_backfill_failure_recovery.py b/python_modules/dagster/dagster_tests/daemon_tests/test_backfill_failure_recovery.py index 85f46ec981da9..592a4fbe204bc 100644 --- a/python_modules/dagster/dagster_tests/daemon_tests/test_backfill_failure_recovery.py +++ b/python_modules/dagster/dagster_tests/daemon_tests/test_backfill_failure_recovery.py @@ -5,7 +5,7 @@ import pytest from dagster import DagsterInstance from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill -from dagster._core.host_representation import ( +from dagster._core.remote_representation import ( ExternalRepository, ) from dagster._core.test_utils import ( diff --git a/python_modules/dagster/dagster_tests/daemon_tests/test_queued_run_coordinator_daemon.py b/python_modules/dagster/dagster_tests/daemon_tests/test_queued_run_coordinator_daemon.py index 3534a519738e5..8bd2202e48546 100644 --- a/python_modules/dagster/dagster_tests/daemon_tests/test_queued_run_coordinator_daemon.py +++ b/python_modules/dagster/dagster_tests/daemon_tests/test_queued_run_coordinator_daemon.py @@ -6,9 +6,9 @@ from dagster._core.definitions.events import AssetKey from dagster._core.definitions.selector import JobSubsetSelector from dagster._core.events import DagsterEvent, DagsterEventType -from dagster._core.host_representation.code_location import GrpcServerCodeLocation -from dagster._core.host_representation.handle import JobHandle -from dagster._core.host_representation.origin import ManagedGrpcPythonEnvCodeLocationOrigin +from dagster._core.remote_representation.code_location import GrpcServerCodeLocation +from dagster._core.remote_representation.handle import JobHandle +from dagster._core.remote_representation.origin import ManagedGrpcPythonEnvCodeLocationOrigin from dagster._core.storage.dagster_run import IN_PROGRESS_RUN_STATUSES, DagsterRunStatus from dagster._core.storage.tags import PRIORITY_TAG from dagster._core.test_utils import ( diff --git a/python_modules/dagster/dagster_tests/definitions_tests/asset_policy_sensors_tests/test_default_auto_materialize_sensors.py b/python_modules/dagster/dagster_tests/definitions_tests/asset_policy_sensors_tests/test_default_auto_materialize_sensors.py index 061cd8359999a..151e58bd34c01 100644 --- a/python_modules/dagster/dagster_tests/definitions_tests/asset_policy_sensors_tests/test_default_auto_materialize_sensors.py +++ b/python_modules/dagster/dagster_tests/definitions_tests/asset_policy_sensors_tests/test_default_auto_materialize_sensors.py @@ -18,10 +18,10 @@ from dagster._core.definitions.sensor_definition import ( SensorType, ) -from dagster._core.host_representation.external import ExternalRepository -from dagster._core.host_representation.external_data import external_repository_data_from_def -from dagster._core.host_representation.handle import RepositoryHandle -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.external import ExternalRepository +from dagster._core.remote_representation.external_data import external_repository_data_from_def +from dagster._core.remote_representation.handle import RepositoryHandle +from dagster._core.remote_representation.origin import ( ExternalRepositoryOrigin, RegisteredCodeLocationOrigin, ) diff --git a/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/base_scenario.py b/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/base_scenario.py index 15b2c73a0aa89..ecb351a272a97 100644 --- a/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/base_scenario.py +++ b/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/base_scenario.py @@ -74,7 +74,7 @@ from dagster._core.events.log import EventLogEntry from dagster._core.execution.asset_backfill import AssetBackfillData from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill -from dagster._core.host_representation.origin import InProcessCodeLocationOrigin +from dagster._core.remote_representation.origin import InProcessCodeLocationOrigin from dagster._core.storage.dagster_run import DagsterRun from dagster._core.test_utils import ( InProcessTestWorkspaceLoadTarget, diff --git a/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/scenario_state.py b/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/scenario_state.py index 7dd2297f6dfc7..17ff85c6d3a5a 100644 --- a/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/scenario_state.py +++ b/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/scenario_state.py @@ -37,9 +37,9 @@ from dagster._core.definitions.repository_definition.valid_definitions import ( SINGLETON_REPOSITORY_NAME, ) -from dagster._core.host_representation.external_data import external_repository_data_from_def -from dagster._core.host_representation.origin import InProcessCodeLocationOrigin from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external_data import external_repository_data_from_def +from dagster._core.remote_representation.origin import InProcessCodeLocationOrigin from dagster._core.storage.tags import PARTITION_NAME_TAG from dagster._core.test_utils import ( InProcessTestWorkspaceLoadTarget, diff --git a/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/updated_scenarios/asset_daemon_scenario.py b/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/updated_scenarios/asset_daemon_scenario.py index 6acc474dc1e09..bfaa59b68a79c 100644 --- a/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/updated_scenarios/asset_daemon_scenario.py +++ b/python_modules/dagster/dagster_tests/definitions_tests/auto_materialize_tests/updated_scenarios/asset_daemon_scenario.py @@ -41,7 +41,7 @@ from dagster._core.definitions.repository_definition.valid_definitions import ( SINGLETON_REPOSITORY_NAME, ) -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.origin import ( ExternalInstigatorOrigin, ExternalRepositoryOrigin, ) diff --git a/python_modules/dagster/dagster_tests/general_tests/asset_graph_differ_tests/test_asset_graph_differ.py b/python_modules/dagster/dagster_tests/general_tests/asset_graph_differ_tests/test_asset_graph_differ.py index aeb5d3d9c5f1a..caa5a54cc3cfd 100644 --- a/python_modules/dagster/dagster_tests/general_tests/asset_graph_differ_tests/test_asset_graph_differ.py +++ b/python_modules/dagster/dagster_tests/general_tests/asset_graph_differ_tests/test_asset_graph_differ.py @@ -11,7 +11,7 @@ from dagster._core.definitions.repository_definition.valid_definitions import ( SINGLETON_REPOSITORY_NAME, ) -from dagster._core.host_representation.origin import InProcessCodeLocationOrigin +from dagster._core.remote_representation.origin import InProcessCodeLocationOrigin from dagster._core.types.loadable_target_origin import LoadableTargetOrigin from dagster._core.workspace.context import WorkspaceRequestContext from dagster._core.workspace.workspace import ( diff --git a/python_modules/dagster/dagster_tests/general_tests/compat_tests/test_back_compat.py b/python_modules/dagster/dagster_tests/general_tests/compat_tests/test_back_compat.py index f6e543a629d02..0211377ead168 100644 --- a/python_modules/dagster/dagster_tests/general_tests/compat_tests/test_back_compat.py +++ b/python_modules/dagster/dagster_tests/general_tests/compat_tests/test_back_compat.py @@ -31,8 +31,8 @@ from dagster._core.events import DagsterEvent, StepMaterializationData from dagster._core.events.log import EventLogEntry from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill -from dagster._core.host_representation.external_data import ExternalStaticPartitionsDefinitionData from dagster._core.instance import DagsterInstance, InstanceRef +from dagster._core.remote_representation.external_data import ExternalStaticPartitionsDefinitionData from dagster._core.scheduler.instigation import InstigatorState, InstigatorTick from dagster._core.storage.dagster_run import DagsterRun, DagsterRunStatus, RunsFilter from dagster._core.storage.event_log.migration import migrate_event_log_data @@ -667,7 +667,7 @@ def __new__(cls, host, port=None, socket=None, location_name=None, use_ssl=None) legacy_env, klass, repo_klass, location_klass = build_legacy_whitelist_map() - from dagster._core.host_representation.origin import ( + from dagster._core.remote_representation.origin import ( ExternalInstigatorOrigin, ExternalRepositoryOrigin, GrpcServerCodeLocationOrigin, @@ -912,7 +912,7 @@ def test_repo_label_tag_migration(): def test_add_bulk_actions_columns(): - from dagster._core.host_representation.origin import ( + from dagster._core.remote_representation.origin import ( ExternalPartitionSetOrigin, ExternalRepositoryOrigin, GrpcServerCodeLocationOrigin, diff --git a/python_modules/dagster/dagster_tests/general_tests/compat_tests/test_change_snapshot_structure.py b/python_modules/dagster/dagster_tests/general_tests/compat_tests/test_change_snapshot_structure.py index 12493854effe3..b2782589e94e9 100644 --- a/python_modules/dagster/dagster_tests/general_tests/compat_tests/test_change_snapshot_structure.py +++ b/python_modules/dagster/dagster_tests/general_tests/compat_tests/test_change_snapshot_structure.py @@ -1,5 +1,5 @@ -from dagster._core.host_representation import ExternalExecutionPlan from dagster._core.instance import DagsterInstance, InstanceRef +from dagster._core.remote_representation import ExternalExecutionPlan from dagster._core.snap import create_execution_plan_snapshot_id, create_job_snapshot_id from dagster._utils import file_relative_path from dagster._utils.test import copy_directory diff --git a/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_grpc_server_registry.py b/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_grpc_server_registry.py index d082a156e2723..db8deb36f68f3 100644 --- a/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_grpc_server_registry.py +++ b/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_grpc_server_registry.py @@ -6,9 +6,9 @@ import pytest from dagster import file_relative_path, job, repository from dagster._core.errors import DagsterUserCodeProcessError -from dagster._core.host_representation.code_location import GrpcServerCodeLocation -from dagster._core.host_representation.grpc_server_registry import GrpcServerRegistry -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.code_location import GrpcServerCodeLocation +from dagster._core.remote_representation.grpc_server_registry import GrpcServerRegistry +from dagster._core.remote_representation.origin import ( ManagedGrpcPythonEnvCodeLocationOrigin, RegisteredCodeLocationOrigin, ) diff --git a/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_metrics.py b/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_metrics.py index 2dc7973e2f120..6415dc22ea2c1 100644 --- a/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_metrics.py +++ b/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_metrics.py @@ -7,11 +7,11 @@ from typing import Any import pytest -from dagster._core.host_representation import ExternalRepositoryOrigin -from dagster._core.host_representation.origin import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ExternalRepositoryOrigin +from dagster._core.remote_representation.origin import ( GrpcServerCodeLocationOrigin, ) -from dagster._core.instance import DagsterInstance from dagster._core.test_utils import ( instance_for_test, ) diff --git a/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_persistent.py b/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_persistent.py index 6c34de747392e..54e75038fd74e 100644 --- a/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_persistent.py +++ b/python_modules/dagster/dagster_tests/general_tests/grpc_tests/test_persistent.py @@ -8,7 +8,7 @@ from dagster import _seven from dagster._api.list_repositories import sync_list_repositories_grpc from dagster._core.errors import DagsterUserCodeUnreachableError -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.origin import ( ExternalJobOrigin, ExternalRepositoryOrigin, GrpcServerCodeLocationOrigin, diff --git a/python_modules/dagster/dagster_tests/scheduler_tests/conftest.py b/python_modules/dagster/dagster_tests/scheduler_tests/conftest.py index 0fa22c3e94722..a7e5ee152d0ad 100644 --- a/python_modules/dagster/dagster_tests/scheduler_tests/conftest.py +++ b/python_modules/dagster/dagster_tests/scheduler_tests/conftest.py @@ -3,8 +3,8 @@ from typing import Iterator, Optional import pytest -from dagster._core.host_representation.external import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalRepository from dagster._core.test_utils import ( SingleThreadPoolExecutor, create_test_daemon_workspace_context, diff --git a/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_failure_recovery.py b/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_failure_recovery.py index b944e2dcc8f49..cf0eb7f7aa948 100644 --- a/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_failure_recovery.py +++ b/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_failure_recovery.py @@ -5,9 +5,9 @@ import pendulum import pytest -from dagster._core.host_representation.external import ExternalRepository from dagster._core.instance import DagsterInstance from dagster._core.instance.ref import InstanceRef +from dagster._core.remote_representation.external import ExternalRepository from dagster._core.scheduler.instigation import TickStatus from dagster._core.storage.dagster_run import DagsterRunStatus from dagster._core.storage.tags import SCHEDULED_EXECUTION_TIME_TAG diff --git a/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_run.py b/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_run.py index 90bef8326f915..d8da1b3ed84ca 100644 --- a/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_run.py +++ b/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_run.py @@ -27,16 +27,16 @@ from dagster._core.definitions.data_version import DataVersion from dagster._core.definitions.decorators.source_asset_decorator import observable_source_asset from dagster._core.definitions.run_request import RunRequest -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation import ( CodeLocation, ExternalInstigatorOrigin, ExternalRepositoryOrigin, GrpcServerCodeLocation, GrpcServerCodeLocationOrigin, ) -from dagster._core.host_representation.external import ExternalRepository, ExternalSchedule -from dagster._core.host_representation.origin import ManagedGrpcPythonEnvCodeLocationOrigin -from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalRepository, ExternalSchedule +from dagster._core.remote_representation.origin import ManagedGrpcPythonEnvCodeLocationOrigin from dagster._core.scheduler.instigation import ( InstigatorState, InstigatorStatus, diff --git a/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_timezones.py b/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_timezones.py index 4651af998fdc1..95a33b33fc723 100644 --- a/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_timezones.py +++ b/python_modules/dagster/dagster_tests/scheduler_tests/test_scheduler_timezones.py @@ -2,8 +2,8 @@ import pendulum import pytest -from dagster._core.host_representation.external import ExternalRepository from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalRepository from dagster._core.scheduler.instigation import TickStatus from dagster._core.workspace.context import WorkspaceProcessContext from dagster._seven.compat.pendulum import create_pendulum_time, pendulum_freeze_time, to_timezone diff --git a/python_modules/dagster/dagster_tests/storage_tests/test_dagster_run.py b/python_modules/dagster/dagster_tests/storage_tests/test_dagster_run.py index 1340944b7d627..08380600021ec 100644 --- a/python_modules/dagster/dagster_tests/storage_tests/test_dagster_run.py +++ b/python_modules/dagster/dagster_tests/storage_tests/test_dagster_run.py @@ -4,16 +4,16 @@ import pytest from dagster._check import CheckError from dagster._core.code_pointer import ModuleCodePointer -from dagster._core.host_representation.origin import ( - ExternalJobOrigin, - ExternalRepositoryOrigin, - InProcessCodeLocationOrigin, -) from dagster._core.origin import ( DEFAULT_DAGSTER_ENTRY_POINT, JobPythonOrigin, RepositoryPythonOrigin, ) +from dagster._core.remote_representation.origin import ( + ExternalJobOrigin, + ExternalRepositoryOrigin, + InProcessCodeLocationOrigin, +) from dagster._core.storage.dagster_run import ( IN_PROGRESS_RUN_STATUSES, NON_IN_PROGRESS_RUN_STATUSES, diff --git a/python_modules/dagster/dagster_tests/storage_tests/test_job_run.py b/python_modules/dagster/dagster_tests/storage_tests/test_job_run.py index 1340944b7d627..08380600021ec 100644 --- a/python_modules/dagster/dagster_tests/storage_tests/test_job_run.py +++ b/python_modules/dagster/dagster_tests/storage_tests/test_job_run.py @@ -4,16 +4,16 @@ import pytest from dagster._check import CheckError from dagster._core.code_pointer import ModuleCodePointer -from dagster._core.host_representation.origin import ( - ExternalJobOrigin, - ExternalRepositoryOrigin, - InProcessCodeLocationOrigin, -) from dagster._core.origin import ( DEFAULT_DAGSTER_ENTRY_POINT, JobPythonOrigin, RepositoryPythonOrigin, ) +from dagster._core.remote_representation.origin import ( + ExternalJobOrigin, + ExternalRepositoryOrigin, + InProcessCodeLocationOrigin, +) from dagster._core.storage.dagster_run import ( IN_PROGRESS_RUN_STATUSES, NON_IN_PROGRESS_RUN_STATUSES, diff --git a/python_modules/dagster/dagster_tests/storage_tests/utils/event_log_storage.py b/python_modules/dagster/dagster_tests/storage_tests/utils/event_log_storage.py index b4b2012c13e40..a807f23d77c49 100644 --- a/python_modules/dagster/dagster_tests/storage_tests/utils/event_log_storage.py +++ b/python_modules/dagster/dagster_tests/storage_tests/utils/event_log_storage.py @@ -72,15 +72,15 @@ from dagster._core.execution.plan.handle import StepHandle from dagster._core.execution.plan.objects import StepFailureData, StepSuccessData from dagster._core.execution.stats import StepEventStatus -from dagster._core.host_representation.external_data import ( +from dagster._core.instance import RUNLESS_JOB_NAME, RUNLESS_RUN_ID +from dagster._core.remote_representation.external_data import ( external_partitions_definition_from_def, ) -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.origin import ( ExternalJobOrigin, ExternalRepositoryOrigin, InProcessCodeLocationOrigin, ) -from dagster._core.instance import RUNLESS_JOB_NAME, RUNLESS_RUN_ID from dagster._core.storage.asset_check_execution_record import ( AssetCheckExecutionRecordStatus, ) diff --git a/python_modules/dagster/dagster_tests/storage_tests/utils/run_storage.py b/python_modules/dagster/dagster_tests/storage_tests/utils/run_storage.py index 258a024f6cf53..bc8346dbc374d 100644 --- a/python_modules/dagster/dagster_tests/storage_tests/utils/run_storage.py +++ b/python_modules/dagster/dagster_tests/storage_tests/utils/run_storage.py @@ -15,12 +15,12 @@ ) from dagster._core.events import DagsterEvent, DagsterEventType, JobFailureData, RunFailureReason from dagster._core.execution.backfill import BulkActionStatus, PartitionBackfill -from dagster._core.host_representation import ( +from dagster._core.instance import DagsterInstance, InstanceType +from dagster._core.launcher.sync_in_memory_run_launcher import SyncInMemoryRunLauncher +from dagster._core.remote_representation import ( ExternalRepositoryOrigin, ManagedGrpcPythonEnvCodeLocationOrigin, ) -from dagster._core.instance import DagsterInstance, InstanceType -from dagster._core.launcher.sync_in_memory_run_launcher import SyncInMemoryRunLauncher from dagster._core.run_coordinator import DefaultRunCoordinator from dagster._core.snap import create_job_snapshot_id from dagster._core.storage.dagster_run import ( diff --git a/python_modules/libraries/dagster-aws/dagster_aws/ecs/utils.py b/python_modules/libraries/dagster-aws/dagster_aws/ecs/utils.py index 58a5b9c3658f7..ae2afa1dc32ef 100644 --- a/python_modules/libraries/dagster-aws/dagster_aws/ecs/utils.py +++ b/python_modules/libraries/dagster-aws/dagster_aws/ecs/utils.py @@ -2,7 +2,7 @@ import re from typing import Any, Mapping -from dagster._core.host_representation.origin import ExternalJobOrigin +from dagster._core.remote_representation.origin import ExternalJobOrigin from .tasks import DagsterEcsTaskDefinitionConfig diff --git a/python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/conftest.py b/python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/conftest.py index d7a4566c9c06e..626070c98fac9 100644 --- a/python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/conftest.py +++ b/python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/conftest.py @@ -7,8 +7,8 @@ import moto import pytest from dagster._core.definitions.job_definition import JobDefinition -from dagster._core.host_representation.external import ExternalJob from dagster._core.instance import DagsterInstance +from dagster._core.remote_representation.external import ExternalJob from dagster._core.storage.dagster_run import DagsterRun from dagster._core.test_utils import in_process_test_workspace, instance_for_test from dagster._core.types.loadable_target_origin import LoadableTargetOrigin diff --git a/python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/test_utils.py b/python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/test_utils.py index e8852d9883d47..b3369130db3a9 100644 --- a/python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/test_utils.py +++ b/python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/test_utils.py @@ -1,4 +1,4 @@ -from dagster._core.host_representation.origin import ( +from dagster._core.remote_representation.origin import ( ExternalJobOrigin, ExternalRepositoryOrigin, RegisteredCodeLocationOrigin, diff --git a/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s/config.py b/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s/config.py index 558d22193e43e..e747088a92be2 100644 --- a/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s/config.py +++ b/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s/config.py @@ -1,5 +1,5 @@ from dagster import Field, Float, Noneable, StringSource -from dagster._core.host_representation import IN_PROCESS_NAME +from dagster._core.remote_representation import IN_PROCESS_NAME from dagster._utils.merger import merge_dicts from dagster_celery.executor import CELERY_CONFIG from dagster_k8s import DagsterK8sJobConfig diff --git a/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s_tests/test_launcher.py b/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s_tests/test_launcher.py index 3450dd4ddd8f2..60b0d7f04785d 100644 --- a/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s_tests/test_launcher.py +++ b/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s_tests/test_launcher.py @@ -5,8 +5,8 @@ from dagster import reconstructable from dagster._check import CheckError from dagster._core.definitions.decorators.job_decorator import job -from dagster._core.host_representation import RepositoryHandle from dagster._core.launcher import LaunchRunContext +from dagster._core.remote_representation import RepositoryHandle from dagster._core.storage.tags import DOCKER_IMAGE_TAG from dagster._core.test_utils import ( create_run_for_test, diff --git a/python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_executor.py b/python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_executor.py index a271fa8f859fc..9df1f19634035 100644 --- a/python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_executor.py +++ b/python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_executor.py @@ -11,7 +11,7 @@ from dagster._core.execution.retries import RetryMode from dagster._core.executor.init import InitExecutorContext from dagster._core.executor.step_delegating.step_handler.base import StepHandlerContext -from dagster._core.host_representation.handle import RepositoryHandle +from dagster._core.remote_representation.handle import RepositoryHandle from dagster._core.storage.fs_io_manager import fs_io_manager from dagster._core.test_utils import ( create_run_for_test, diff --git a/python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_launcher.py b/python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_launcher.py index 406597c508881..2e896a4171e73 100644 --- a/python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_launcher.py +++ b/python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_launcher.py @@ -4,9 +4,9 @@ import pytest from dagster import DagsterRunStatus, job, reconstructable -from dagster._core.host_representation import RepositoryHandle from dagster._core.launcher import LaunchRunContext from dagster._core.launcher.base import WorkerStatus +from dagster._core.remote_representation import RepositoryHandle from dagster._core.storage.tags import DOCKER_IMAGE_TAG from dagster._core.test_utils import ( create_run_for_test,