chore: delete duplicate legacy code

flowersteam · Jun 19, 2023 · bf0b8a7 · bf0b8a7
1 parent 2297356
commit bf0b8a7
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 350 deletions.
diff --git a/services/base/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/base_callback.py b/services/base/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/base_callback.py
diff --git a/...ces/base/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/base_expe_db_callback.py b/...ces/base/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/base_expe_db_callback.py
diff --git a/...ces/base/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/custom_print_callback.py b/...ces/base/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/custom_print_callback.py
diff --git a/...utoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_cancelled_callbacks/__init__.py b/...utoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_cancelled_callbacks/__init__.py
@@ -1,3 +0,0 @@
-from auto_disc.legacy.utils.callbacks.on_cancelled_callbacks.base_on_cancelled_callback import (
-    BaseOnCancelledCallback,
-)

diff --git a/.../auto_disc/auto_disc/utils/callbacks/on_cancelled_callbacks/base_on_cancelled_callback.py b/.../auto_disc/auto_disc/utils/callbacks/on_cancelled_callbacks/base_on_cancelled_callback.py
diff --git a/...utoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_discovery_callbacks/__init__.py b/...utoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_discovery_callbacks/__init__.py
@@ -1,6 +0,0 @@
-from auto_disc.legacy.utils.callbacks.on_discovery_callbacks.base_on_discovery_callback import (
-    BaseOnDiscoveryCallback,
-)
-from auto_disc.legacy.utils.callbacks.on_discovery_callbacks.on_discovery_save_callback_on_disk import (
-    OnDiscoverySaveCallbackOnDisk,
-)

diff --git a/.../auto_disc/auto_disc/utils/callbacks/on_discovery_callbacks/base_on_discovery_callback.py b/.../auto_disc/auto_disc/utils/callbacks/on_discovery_callbacks/base_on_discovery_callback.py
diff --git a/...sc/auto_disc/utils/callbacks/on_discovery_callbacks/on_discovery_save_callback_on_disk.py b/...sc/auto_disc/utils/callbacks/on_discovery_callbacks/on_discovery_save_callback_on_disk.py
diff --git a/...se/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_error_callbacks/__init__.py b/...se/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_error_callbacks/__init__.py
@@ -1,3 +0,0 @@
-from auto_disc.legacy.utils.callbacks.on_error_callbacks.base_on_error_callback import (
-    BaseOnErrorCallback,
-)

diff --git a/...ver/libs/auto_disc/auto_disc/utils/callbacks/on_error_callbacks/base_on_error_callback.py b/...ver/libs/auto_disc/auto_disc/utils/callbacks/on_error_callbacks/base_on_error_callback.py
diff --git a/...AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_finished_callbacks/__init__.py b/...AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_finished_callbacks/__init__.py
@@ -1,3 +0,0 @@
-from auto_disc.legacy.utils.callbacks.on_finished_callbacks.base_on_finished_callback import (
-    BaseOnFinishedCallback,
-)

diff --git a/...bs/auto_disc/auto_disc/utils/callbacks/on_finished_callbacks/base_on_finished_callback.py b/...bs/auto_disc/auto_disc/utils/callbacks/on_finished_callbacks/base_on_finished_callback.py
diff --git a/...ase/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_save_callbacks/__init__.py b/...ase/AutoDiscServer/libs/auto_disc/auto_disc/utils/callbacks/on_save_callbacks/__init__.py
@@ -1,6 +0,0 @@
-from auto_disc.legacy.utils.callbacks.on_save_callbacks.base_on_save_callback import (
-    BaseOnSaveCallback,
-)
-from auto_disc.legacy.utils.callbacks.on_save_callbacks.on_save_modules_on_disk_callback import (
-    OnSaveModulesOnDiskCallback,
-)

diff --git a/...erver/libs/auto_disc/auto_disc/utils/callbacks/on_save_callbacks/base_on_save_callback.py b/...erver/libs/auto_disc/auto_disc/utils/callbacks/on_save_callbacks/base_on_save_callback.py
diff --git a/...iscServer/libs/auto_disc/auto_disc/utils/callbacks/on_save_finished_callbacks/__init__.py b/...iscServer/libs/auto_disc/auto_disc/utils/callbacks/on_save_finished_callbacks/__init__.py
@@ -1,3 +0,0 @@
-from auto_disc.legacy.utils.callbacks.on_save_finished_callbacks.base_on_save_finished_callback import (
-    BaseOnSaveFinishedCallback,
-)

diff --git a/...sc/auto_disc/utils/callbacks/on_save_finished_callbacks/base_on_save_finished_callback.py b/...sc/auto_disc/utils/callbacks/on_save_finished_callbacks/base_on_save_finished_callback.py
diff --git a/services/base/AutoDiscServer/libs/auto_disc/utils/leafutils/leafstructs/registration.py b/services/base/AutoDiscServer/libs/auto_disc/utils/leafutils/leafstructs/registration.py
@@ -31,13 +31,13 @@
             "base": "auto_disc.auto_disc.utils.callbacks.on_discovery_callbacks.save_discovery_on_disk.SaveDiscoveryOnDisk",
         },
         "on_cancelled": {
-            "base": "auto_disc.auto_disc.utils.callbacks.on_cancelled_callbacks.BaseOnCancelledCallback"
+            "base": "auto_disc.legacy.utils.callbacks.on_cancelled_callbacks.BaseOnCancelledCallback"
         },
         "on_error": {
-            "base": "auto_disc.auto_disc.utils.callbacks.on_error_callbacks.BaseOnErrorCallback"
+            "base": "auto_disc.legacy.utils.callbacks.on_error_callbacks.BaseOnErrorCallback"
         },
         "on_finished": {
-            "base": "auto_disc.auto_disc.utils.callbacks.on_finished_callbacks.BaseOnFinishedCallback"
+            "base": "auto_disc.legacy.utils.callbacks.on_finished_callbacks.BaseOnFinishedCallback"
         },
         "on_saved": {
             "base": "auto_disc.auto_disc.utils.callbacks.on_save_callbacks.save_leaf_callback.SaveLeaf",
@@ -47,9 +47,9 @@
             "base": "auto_disc.auto_disc.utils.callbacks.on_save_finished_callbacks.generate_report_callback.GenerateReport",
         },
         "interact": {
-            "base": "auto_disc.utils.callbacks.interact_callbacks.BaseInteractCallback",
-            "saveDisk": "auto_disc.utils.callbacks.interact_callbacks.SaveDiskInteractCallback",
-            "readDisk": "auto_disc.utils.callbacks.interact_callbacks.ReadDiskInteractCallback",
+            "base": "auto_disc.legacy.utils.callbacks.interact_callbacks.BaseInteractCallback",
+            "saveDisk": "auto_disc.auto_disc.utils.callbacks.interact_callbacks.SaveDiskInteractCallback",
+            "readDisk": "auto_disc.auto_disc.utils.callbacks.interact_callbacks.ReadDiskInteractCallback",
         },
     },
     "logger_handlers": {