Skip to content

Commit 94f78c7

Browse files
Lena Kashtelyanmeta-codesync[bot]
authored andcommitted
Move WithDBSettingsBase to sqa_store (#4700)
Summary: Pull Request resolved: #4700 Same reasoning as in D89737933: `ax/service` was always a misnomer (of my creation, no denying here), time for it to be ready to die once `AxClient` is deprecated! Reviewed By: esantorella Differential Revision: D89749717 Privacy Context Container: L1307644 fbshipit-source-id: 38f37fc3837c58997c5c1146c2249272f4bc12cb
1 parent e767294 commit 94f78c7

File tree

10 files changed

+18
-25
lines changed

10 files changed

+18
-25
lines changed

ax/api/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
from ax.generation_strategy.generation_strategy import GenerationStrategy
4747
from ax.orchestration.orchestrator import Orchestrator, OrchestratorOptions
4848
from ax.service.utils.best_point_mixin import BestPointMixin
49-
from ax.service.utils.with_db_settings_base import WithDBSettingsBase
5049
from ax.storage.json_store.decoder import (
5150
generation_strategy_from_json,
5251
object_from_json,
@@ -58,6 +57,7 @@
5857
CORE_DECODER_REGISTRY,
5958
CORE_ENCODER_REGISTRY,
6059
)
60+
from ax.storage.sqa_store.with_db_settings_base import WithDBSettingsBase
6161
from ax.utils.common.logger import _round_floats_for_logging, get_logger
6262
from ax.utils.common.random import with_rng_seed
6363

ax/api/tests/test_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
from ax.core.trial_status import TrialStatus
4141
from ax.early_stopping.strategies import PercentileEarlyStoppingStrategy
4242
from ax.exceptions.core import UnsupportedError, UserInputError
43-
from ax.service.utils.with_db_settings_base import (
43+
from ax.storage.sqa_store.db import init_test_engine_and_session_factory
44+
from ax.storage.sqa_store.with_db_settings_base import (
4445
_save_generation_strategy_to_db_if_possible,
4546
)
46-
from ax.storage.sqa_store.db import init_test_engine_and_session_factory
4747
from ax.utils.common.testutils import TestCase
4848
from ax.utils.testing.core_stubs import (
4949
get_branin_experiment,
@@ -392,7 +392,7 @@ def test_get_next_trials(self) -> None:
392392

393393
# Test respects fixed features
394394
with mock.patch(
395-
"ax.service.utils.with_db_settings_base"
395+
"ax.storage.sqa_store.with_db_settings_base"
396396
"._save_generation_strategy_to_db_if_possible"
397397
) as mock_save:
398398
trials = client.get_next_trials(max_trials=1, fixed_parameters={"x1": 0.5})
@@ -430,7 +430,7 @@ def test_get_next_trials_with_db(self) -> None:
430430
)
431431
# Generate one more trial, so that GS transitions to BO.
432432
with mock.patch(
433-
"ax.service.utils.with_db_settings_base"
433+
"ax.storage.sqa_store.with_db_settings_base"
434434
"._save_generation_strategy_to_db_if_possible",
435435
wraps=_save_generation_strategy_to_db_if_possible,
436436
) as mock_save:

ax/orchestration/orchestrator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
from ax.orchestration.orchestrator_options import OrchestratorOptions, TrialType
4949
from ax.service.utils.best_point import derelativize_opt_config, is_row_feasible
5050
from ax.service.utils.best_point_mixin import BestPointMixin
51-
from ax.service.utils.with_db_settings_base import DBSettings, WithDBSettingsBase
51+
from ax.storage.sqa_store.with_db_settings_base import DBSettings, WithDBSettingsBase
5252
from ax.utils.common.constants import Keys
5353
from ax.utils.common.executils import retry_on_exception
5454
from ax.utils.common.logger import (

ax/orchestration/tests/test_orchestrator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
TEST_MEAN,
7979
TestOrchestrator,
8080
)
81-
from ax.service.utils.with_db_settings_base import WithDBSettingsBase
8281
from ax.storage.json_store.encoders import runner_to_dict
8382
from ax.storage.json_store.registry import CORE_DECODER_REGISTRY, CORE_ENCODER_REGISTRY
8483
from ax.storage.metric_registry import CORE_METRIC_REGISTRY
@@ -89,6 +88,7 @@
8988
from ax.storage.sqa_store.save import save_experiment
9089
from ax.storage.sqa_store.sqa_config import SQAConfig
9190
from ax.storage.sqa_store.structs import DBSettings
91+
from ax.storage.sqa_store.with_db_settings_base import WithDBSettingsBase
9292
from ax.utils.common.constants import Keys
9393
from ax.utils.common.logger import AX_ROOT_LOGGER_NAME
9494
from ax.utils.common.testutils import TestCase

ax/service/ax_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
InstantiationBase,
6262
ObjectiveProperties,
6363
)
64-
from ax.service.utils.with_db_settings_base import TDBSettings
6564
from ax.storage.json_store.decoder import (
6665
generation_strategy_from_json,
6766
object_from_json,
@@ -74,6 +73,7 @@
7473
CORE_ENCODER_REGISTRY,
7574
TDecoderRegistry,
7675
)
76+
from ax.storage.sqa_store.with_db_settings_base import TDBSettings
7777
from ax.utils.common.docutils import copy_doc
7878
from ax.utils.common.executils import retry_on_exception
7979
from ax.utils.common.logger import _round_floats_for_logging, get_logger

ax/service/utils/analysis_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from ax.core.analysis_card import AnalysisCardBase
1313
from ax.core.experiment import Experiment
1414
from ax.generation_strategy.generation_strategy import GenerationStrategy
15-
from ax.service.utils.with_db_settings_base import WithDBSettingsBase
15+
from ax.storage.sqa_store.with_db_settings_base import WithDBSettingsBase
1616

1717

1818
class AnalysisBase(WithDBSettingsBase):

ax/service/tests/test_with_db_settings_base.py renamed to ax/storage/sqa_store/tests/test_with_db_settings_base.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
from ax.core.experiment import Experiment
1414
from ax.core.trial_status import TrialStatus
1515
from ax.generation_strategy.generation_strategy import GenerationStrategy
16-
from ax.service.utils.with_db_settings_base import (
17-
try_load_generation_strategy,
18-
WithDBSettingsBase,
19-
)
2016
from ax.storage.sqa_store.db import init_test_engine_and_session_factory
2117
from ax.storage.sqa_store.load import (
2218
_load_experiment,
@@ -29,6 +25,10 @@
2925
_save_or_update_trials,
3026
)
3127
from ax.storage.sqa_store.structs import DBSettings
28+
from ax.storage.sqa_store.with_db_settings_base import (
29+
try_load_generation_strategy,
30+
WithDBSettingsBase,
31+
)
3232
from ax.utils.common.testutils import TestCase
3333
from ax.utils.testing.core_stubs import DEFAULT_USER, get_experiment, get_generator_run
3434
from ax.utils.testing.modeling_stubs import get_generation_strategy
@@ -362,7 +362,7 @@ def test_try_load_generation_strategy(self) -> None:
362362
)
363363
# test logging with no experiment/gs saved
364364
with self.assertLogs(
365-
logger="ax.service.utils.with_db_settings_base", level=logging.DEBUG
365+
logger="ax.storage.sqa_store.with_db_settings_base", level=logging.DEBUG
366366
) as lg:
367367
output = try_load_generation_strategy(
368368
experiment_name=experiment.name,
@@ -384,7 +384,7 @@ def test_try_load_generation_strategy(self) -> None:
384384
self.assertTrue(exp_saved)
385385
self.assertTrue(gs_saved)
386386
with self.assertLogs(
387-
logger="ax.service.utils.with_db_settings_base", level=logging.DEBUG
387+
logger="ax.storage.sqa_store.with_db_settings_base", level=logging.DEBUG
388388
) as lg:
389389
output = try_load_generation_strategy(
390390
experiment_name=experiment.name,

ax/service/tests/test_with_db_settings_base_minimal_dependencies.py renamed to ax/storage/sqa_store/tests/test_with_db_settings_base_minimal_dependencies.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@
1313
class TestWithDbSetingsBaseMinimalDependencies(TestCase):
1414
@patch.dict("sys.modules", {"sqlalchemy": None})
1515
def test_with_db_settings_base_no_sql_alchemy(self) -> None:
16-
from ax.service.utils.with_db_settings_base import WithDBSettingsBase # noqa
16+
from ax.storage.sqa_store.with_db_settings_base import ( # noqa
17+
WithDBSettingsBase,
18+
)
File renamed without changes.

sphinx/source/service.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,6 @@ Reporting
8383
:show-inheritance:
8484

8585

86-
WithDBSettingsBase
87-
~~~~~~~~~~~~~~~~~~
88-
89-
.. automodule:: ax.service.utils.with_db_settings_base
90-
:members:
91-
:undoc-members:
92-
:show-inheritance:
93-
94-
9586
EarlyStopping
9687
~~~~~~~~~~~~~
9788

0 commit comments

Comments
 (0)