Skip to content

Commit

Permalink
Issue #112 AggregatorConfig import cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
soxofaan committed Mar 1, 2024
1 parent 59c6c82 commit e2739c9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 20 deletions.
8 changes: 1 addition & 7 deletions src/openeo_aggregator/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
CONNECTION_TIMEOUT_JOB_LOGS,
CONNECTION_TIMEOUT_JOB_START,
CONNECTION_TIMEOUT_RESULT,
AggregatorConfig,
get_backend_config,
)
from openeo_aggregator.connection import (
Expand All @@ -94,19 +93,14 @@
normalize_collection_metadata,
single_backend_collection_post_processing,
)
from openeo_aggregator.metadata.reporter import LoggerReporter
from openeo_aggregator.partitionedjobs import PartitionedJob
from openeo_aggregator.partitionedjobs.crossbackend import (
CrossBackendSplitter,
SubGraphId,
)
from openeo_aggregator.partitionedjobs.crossbackend import CrossBackendSplitter
from openeo_aggregator.partitionedjobs.splitting import FlimsySplitter, TileGridSplitter
from openeo_aggregator.partitionedjobs.tracking import (
PartitionedJobConnection,
PartitionedJobTracker,
)
from openeo_aggregator.utils import (
Clock,
FlatPG,
PGWithMetadata,
dict_merge,
Expand Down
2 changes: 1 addition & 1 deletion src/openeo_aggregator/caching.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from kazoo.client import KazooClient
from openeo.util import TimingLogger

from openeo_aggregator.config import AggregatorConfig, get_backend_config
from openeo_aggregator.config import get_backend_config
from openeo_aggregator.utils import AttrStatsProxy, Clock, strip_join

DEFAULT_NAMESPACE = "_default"
Expand Down
1 change: 0 additions & 1 deletion src/openeo_aggregator/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
CONNECTION_TIMEOUT_DEFAULT,
CONNECTION_TIMEOUT_INIT,
STREAM_CHUNK_SIZE_DEFAULT,
AggregatorConfig,
get_backend_config,
)
from openeo_aggregator.utils import _UNSET, Clock, EventHandler
Expand Down
10 changes: 4 additions & 6 deletions src/openeo_aggregator/partitionedjobs/tracking.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import collections
import contextlib
import dataclasses
import datetime
import logging
import threading
from typing import Dict, List, Optional, Union
from typing import Dict, List, Optional

import flask
from openeo.api.logs import LogEntry
from openeo.rest.job import BatchJob, ResultAsset
from openeo.util import TimingLogger, rfc3339
from openeo.util import TimingLogger
from openeo_driver.errors import JobNotFinishedException
from openeo_driver.users import User

from openeo_aggregator.config import CONNECTION_TIMEOUT_JOB_START, AggregatorConfig
from openeo_aggregator.config import CONNECTION_TIMEOUT_JOB_START
from openeo_aggregator.connection import MultiBackendConnection
from openeo_aggregator.partitionedjobs import (
STATUS_CREATED,
Expand All @@ -31,7 +29,7 @@
)
from openeo_aggregator.partitionedjobs.splitting import TileGridSplitter
from openeo_aggregator.partitionedjobs.zookeeper import ZooKeeperPartitionedJobDB
from openeo_aggregator.utils import _UNSET, Clock, PGWithMetadata, timestamp_to_rfc3339
from openeo_aggregator.utils import _UNSET, Clock, PGWithMetadata

PJOB_METADATA_FIELD_RESULT_JOBS = "result_jobs"

Expand Down
6 changes: 1 addition & 5 deletions src/openeo_aggregator/partitionedjobs/zookeeper.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
from kazoo.exceptions import NodeExistsError, NoNodeError
from openeo_driver.errors import JobNotFoundException

from openeo_aggregator.config import (
AggregatorConfig,
ConfigException,
get_backend_config,
)
from openeo_aggregator.config import ConfigException, get_backend_config
from openeo_aggregator.partitionedjobs import (
STATUS_INSERTED,
PartitionedJob,
Expand Down

0 comments on commit e2739c9

Please sign in to comment.