diff --git a/.idea/misc.xml b/.idea/misc.xml
index 61d7a0c..b6ce6a8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/.idea/server-simulator.iml b/.idea/server-simulator.iml
index dc3d6fb..4166a26 100644
--- a/.idea/server-simulator.iml
+++ b/.idea/server-simulator.iml
@@ -3,8 +3,9 @@
+
-
+
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index d301f30..a064895 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "server-simulator"
-version = "0.1.3"
+version = "0.1.4"
description = "Add your description here"
readme = "README.md"
requires-python = ">=3.10"
@@ -42,7 +42,7 @@ log_cli_date_format = "%Y-%m-%d %H:%M:%S"
line-length = 88
[tool.hatch.build.targets.wheel]
-packages = ["src"]
+packages = ["src/server_simulator"]
[build-system]
requires = ["hatchling"]
diff --git a/src/envs/cluster_simulator/__init__.py b/src/server_simulator/__init__.py
similarity index 100%
rename from src/envs/cluster_simulator/__init__.py
rename to src/server_simulator/__init__.py
diff --git a/src/envs/__init__.py b/src/server_simulator/envs/__init__.py
similarity index 79%
rename from src/envs/__init__.py
rename to src/server_simulator/envs/__init__.py
index 7256ff9..bc9caba 100644
--- a/src/envs/__init__.py
+++ b/src/server_simulator/envs/__init__.py
@@ -1,18 +1,20 @@
-from src.envs.cluster_simulator.base.extractors.reward import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.reward import (
DifferentInPendingJobsRewardCaculator,
)
-from src.envs.cluster_simulator.basic import BasicClusterEnv as BasicClusterEnv
+from src.server_simulator.envs.cluster_simulator.basic import (
+ BasicClusterEnv as BasicClusterEnv,
+)
from gymnasium import register
-from src.envs.cluster_simulator.deep_rm.creator import (
+from src.server_simulator.envs.cluster_simulator.deep_rm.creator import (
DeepRMEnvCreator,
DeepRMCreatorParameters,
)
-from src.envs.cluster_simulator.metric_based.creator import (
+from src.server_simulator.envs.cluster_simulator.metric_based.creator import (
MetricBasedEnvCreator,
MetricBasedCreatorParameters,
)
-from src.envs.cluster_simulator.single_slot.creator import (
+from src.server_simulator.envs.cluster_simulator.single_slot.creator import (
SingleSlotEnvCreator,
SingleSlotCreatorParameters,
)
diff --git a/src/envs/cluster_simulator/base/__init__.py b/src/server_simulator/envs/cluster_simulator/__init__.py
similarity index 100%
rename from src/envs/cluster_simulator/base/__init__.py
rename to src/server_simulator/envs/cluster_simulator/__init__.py
diff --git a/src/envs/cluster_simulator/actions.py b/src/server_simulator/envs/cluster_simulator/actions.py
similarity index 92%
rename from src/envs/cluster_simulator/actions.py
rename to src/server_simulator/envs/cluster_simulator/actions.py
index 148b269..6b9d6f2 100644
--- a/src/envs/cluster_simulator/actions.py
+++ b/src/server_simulator/envs/cluster_simulator/actions.py
@@ -1,7 +1,10 @@
from typing import NamedTuple, Tuple, TypeVar
import gymnasium as gym
-from src.envs.cluster_simulator.base.internal.cluster import ClusterAction, ClusterABC
+from src.server_simulator.envs.cluster_simulator.base.internal.cluster import (
+ ClusterAction,
+ ClusterABC,
+)
Cluster = TypeVar("Cluster", bound=ClusterABC)
diff --git a/src/envs/cluster_simulator/base/extractors/__init__.py b/src/server_simulator/envs/cluster_simulator/base/__init__.py
similarity index 100%
rename from src/envs/cluster_simulator/base/extractors/__init__.py
rename to src/server_simulator/envs/cluster_simulator/base/__init__.py
diff --git a/src/envs/cluster_simulator/utils/__init__.py b/src/server_simulator/envs/cluster_simulator/base/extractors/__init__.py
similarity index 100%
rename from src/envs/cluster_simulator/utils/__init__.py
rename to src/server_simulator/envs/cluster_simulator/base/extractors/__init__.py
diff --git a/src/envs/cluster_simulator/base/extractors/information.py b/src/server_simulator/envs/cluster_simulator/base/extractors/information.py
similarity index 86%
rename from src/envs/cluster_simulator/base/extractors/information.py
rename to src/server_simulator/envs/cluster_simulator/base/extractors/information.py
index b340c96..ee213fa 100644
--- a/src/envs/cluster_simulator/base/extractors/information.py
+++ b/src/server_simulator/envs/cluster_simulator/base/extractors/information.py
@@ -2,7 +2,9 @@
from typing import TypeVar, TypedDict, Generic
import numpy.typing as npt
-from src.envs.cluster_simulator.base.extractors.observation import ClusterObservation
+from src.server_simulator.envs.cluster_simulator.base.extractors.observation import (
+ ClusterObservation,
+)
class ClusterBaseInformation(TypedDict):
diff --git a/src/envs/cluster_simulator/base/extractors/observation.py b/src/server_simulator/envs/cluster_simulator/base/extractors/observation.py
similarity index 81%
rename from src/envs/cluster_simulator/base/extractors/observation.py
rename to src/server_simulator/envs/cluster_simulator/base/extractors/observation.py
index b78785f..0176cb1 100644
--- a/src/envs/cluster_simulator/base/extractors/observation.py
+++ b/src/server_simulator/envs/cluster_simulator/base/extractors/observation.py
@@ -3,9 +3,13 @@
import gymnasium as gym
import numpy.typing as npt
-from src.envs.cluster_simulator.base.internal.cluster import ClusterABC
-from src.envs.cluster_simulator.base.internal.job import JobCollectionConvertor
-from src.envs.cluster_simulator.base.internal.machine import MachinesCollectionConvertor
+from src.server_simulator.envs.cluster_simulator.base.internal.cluster import ClusterABC
+from src.server_simulator.envs.cluster_simulator.base.internal.job import (
+ JobCollectionConvertor,
+)
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
+ MachinesCollectionConvertor,
+)
Cluster = TypeVar("Cluster", bound=ClusterABC)
MachinesRepresentation = TypeVar("MachinesRepresentation")
diff --git a/src/envs/cluster_simulator/base/extractors/reward.py b/src/server_simulator/envs/cluster_simulator/base/extractors/reward.py
similarity index 81%
rename from src/envs/cluster_simulator/base/extractors/reward.py
rename to src/server_simulator/envs/cluster_simulator/base/extractors/reward.py
index 9b5240b..925160e 100644
--- a/src/envs/cluster_simulator/base/extractors/reward.py
+++ b/src/server_simulator/envs/cluster_simulator/base/extractors/reward.py
@@ -1,8 +1,10 @@
from typing import Generic
import abc
-from src.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.base.extractors.information import ClusterInformation
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
+ ClusterInformation,
+)
class RewardCaculator(Generic[ClusterInformation]):
diff --git a/src/wrappers/cluster_simulator/__init__.py b/src/server_simulator/envs/cluster_simulator/base/internal/__init__.py
similarity index 100%
rename from src/wrappers/cluster_simulator/__init__.py
rename to src/server_simulator/envs/cluster_simulator/base/internal/__init__.py
diff --git a/src/envs/cluster_simulator/base/internal/cluster.py b/src/server_simulator/envs/cluster_simulator/base/internal/cluster.py
similarity index 93%
rename from src/envs/cluster_simulator/base/internal/cluster.py
rename to src/server_simulator/envs/cluster_simulator/base/internal/cluster.py
index a70e1f6..677791b 100644
--- a/src/envs/cluster_simulator/base/internal/cluster.py
+++ b/src/server_simulator/envs/cluster_simulator/base/internal/cluster.py
@@ -3,9 +3,17 @@
from rust_enum import enum, Case
-from src.envs.cluster_simulator.base.internal.job import Job, JobCollection
-from src.envs.cluster_simulator.base.internal.job import Status as JobStatus
-from src.envs.cluster_simulator.base.internal.machine import Machine, MachineCollection
+from src.server_simulator.envs.cluster_simulator.base.internal.job import (
+ Job,
+ JobCollection,
+)
+from src.server_simulator.envs.cluster_simulator.base.internal.job import (
+ Status as JobStatus,
+)
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
+ Machine,
+ MachineCollection,
+)
import logging
T = tp.TypeVar("T")
diff --git a/src/envs/cluster_simulator/base/internal/dilation.py b/src/server_simulator/envs/cluster_simulator/base/internal/dilation.py
similarity index 100%
rename from src/envs/cluster_simulator/base/internal/dilation.py
rename to src/server_simulator/envs/cluster_simulator/base/internal/dilation.py
diff --git a/src/envs/cluster_simulator/base/internal/job.py b/src/server_simulator/envs/cluster_simulator/base/internal/job.py
similarity index 100%
rename from src/envs/cluster_simulator/base/internal/job.py
rename to src/server_simulator/envs/cluster_simulator/base/internal/job.py
diff --git a/src/envs/cluster_simulator/base/internal/machine.py b/src/server_simulator/envs/cluster_simulator/base/internal/machine.py
similarity index 100%
rename from src/envs/cluster_simulator/base/internal/machine.py
rename to src/server_simulator/envs/cluster_simulator/base/internal/machine.py
diff --git a/src/envs/cluster_simulator/base/renderer.py b/src/server_simulator/envs/cluster_simulator/base/renderer.py
similarity index 83%
rename from src/envs/cluster_simulator/base/renderer.py
rename to src/server_simulator/envs/cluster_simulator/base/renderer.py
index a2bfd31..4171e84 100644
--- a/src/envs/cluster_simulator/base/renderer.py
+++ b/src/server_simulator/envs/cluster_simulator/base/renderer.py
@@ -1,10 +1,10 @@
from types import TracebackType
from typing import TypeVar, Generic
from abc import abstractmethod
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
ClusterBaseInformation,
)
-from src.envs.cluster_simulator.base.extractors.observation import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.observation import (
BaseClusterObservation,
)
from typing_extensions import Self
diff --git a/src/envs/cluster_simulator/basic.py b/src/server_simulator/envs/cluster_simulator/basic.py
similarity index 83%
rename from src/envs/cluster_simulator/basic.py
rename to src/server_simulator/envs/cluster_simulator/basic.py
index 861573a..7987ef2 100644
--- a/src/envs/cluster_simulator/basic.py
+++ b/src/server_simulator/envs/cluster_simulator/basic.py
@@ -2,17 +2,22 @@
import typing as tp
import numpy as np
-from src.envs.cluster_simulator.actions import EnvironmentAction, ActionConvertor
-from src.envs.cluster_simulator.base.extractors.reward import RewardCaculator
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs.cluster_simulator.actions import (
+ EnvironmentAction,
+ ActionConvertor,
+)
+from src.server_simulator.envs.cluster_simulator.base.extractors.reward import (
+ RewardCaculator,
+)
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
ClusterInformation,
BaceClusterInformationExtractor,
)
-from src.envs.cluster_simulator.base.extractors.observation import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.observation import (
ClusterObservation,
BaseObservationCreatorProtocol,
)
-from src.envs.cluster_simulator.base.internal.cluster import ClusterABC
+from src.server_simulator.envs.cluster_simulator.base.internal.cluster import ClusterABC
InputActType = np.int64
T = tp.TypeVar("T", bound=type)
diff --git a/src/envs/cluster_simulator/deep_rm/__init__.py b/src/server_simulator/envs/cluster_simulator/deep_rm/__init__.py
similarity index 92%
rename from src/envs/cluster_simulator/deep_rm/__init__.py
rename to src/server_simulator/envs/cluster_simulator/deep_rm/__init__.py
index c416cff..d4b2aed 100644
--- a/src/envs/cluster_simulator/deep_rm/__init__.py
+++ b/src/server_simulator/envs/cluster_simulator/deep_rm/__init__.py
@@ -2,26 +2,26 @@
import numpy as np
-from src.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.deep_rm.internal.custom_type import (
+from src.server_simulator.envs.cluster_simulator.deep_rm.internal.custom_type import (
_JOBS_TYPE as _JOBS_TYPE,
_MACHINE_TYPE as _MACHINE_TYPE,
_DTYPE as _DTYPE,
)
-from src.envs.cluster_simulator.deep_rm.internal.jobs import (
+from src.server_simulator.envs.cluster_simulator.deep_rm.internal.jobs import (
DeepRMJobs,
DeepRMJobSlot,
DeepRMJobsConvertor as DeepRMJobsConvertor,
)
-from src.envs.cluster_simulator.deep_rm.internal.machines import (
+from src.server_simulator.envs.cluster_simulator.deep_rm.internal.machines import (
DeepRMMachine,
DeepRMMachines,
DeepRMMachinesConvertor as DeepRMMachinesConvertor,
)
-from src.envs.cluster_simulator.base.internal.cluster import ClusterABC
+from src.server_simulator.envs.cluster_simulator.base.internal.cluster import ClusterABC
class DeepRMCluster(ClusterABC[DeepRMMachines, DeepRMJobs]):
diff --git a/src/envs/cluster_simulator/deep_rm/creator.py b/src/server_simulator/envs/cluster_simulator/deep_rm/creator.py
similarity index 73%
rename from src/envs/cluster_simulator/deep_rm/creator.py
rename to src/server_simulator/envs/cluster_simulator/deep_rm/creator.py
index b19b8bb..7c7914e 100644
--- a/src/envs/cluster_simulator/deep_rm/creator.py
+++ b/src/server_simulator/envs/cluster_simulator/deep_rm/creator.py
@@ -1,14 +1,21 @@
from gymnasium.envs.registration import EnvCreator
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
BaceClusterInformationExtractor,
)
-from src.envs.cluster_simulator.base.extractors.reward import RewardCaculator
-from src.envs.cluster_simulator.basic import BasicClusterEnv
+from src.server_simulator.envs.cluster_simulator.base.extractors.reward import (
+ RewardCaculator,
+)
+from src.server_simulator.envs.cluster_simulator.basic import BasicClusterEnv
from typing import TypedDict, Optional
from typing_extensions import Unpack
-from src.envs.cluster_simulator.deep_rm import DeepRMCluster, DeepRMCreators
-from src.envs.cluster_simulator.deep_rm.observation import DeepRMObservationCreator
+from src.server_simulator.envs.cluster_simulator.deep_rm import (
+ DeepRMCluster,
+ DeepRMCreators,
+)
+from src.server_simulator.envs.cluster_simulator.deep_rm.observation import (
+ DeepRMObservationCreator,
+)
__all__ = ["DeepRMCreatorParameters", "DeepRMEnvCreator"]
diff --git a/src/server_simulator/envs/cluster_simulator/deep_rm/internal/__init__.py b/src/server_simulator/envs/cluster_simulator/deep_rm/internal/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/envs/cluster_simulator/deep_rm/internal/custom_type.py b/src/server_simulator/envs/cluster_simulator/deep_rm/internal/custom_type.py
similarity index 100%
rename from src/envs/cluster_simulator/deep_rm/internal/custom_type.py
rename to src/server_simulator/envs/cluster_simulator/deep_rm/internal/custom_type.py
diff --git a/src/envs/cluster_simulator/deep_rm/internal/jobs.py b/src/server_simulator/envs/cluster_simulator/deep_rm/internal/jobs.py
similarity index 93%
rename from src/envs/cluster_simulator/deep_rm/internal/jobs.py
rename to src/server_simulator/envs/cluster_simulator/deep_rm/internal/jobs.py
index c022754..ab2c05c 100644
--- a/src/envs/cluster_simulator/deep_rm/internal/jobs.py
+++ b/src/server_simulator/envs/cluster_simulator/deep_rm/internal/jobs.py
@@ -4,13 +4,13 @@
import numpy.typing as npt
from typing import TypeAlias
from typing_extensions import Unpack
-from src.envs.cluster_simulator.base.internal.job import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import (
Job,
JobCollection,
Status,
JobCollectionConvertor,
)
-from src.envs.cluster_simulator.deep_rm.internal.custom_type import (
+from src.server_simulator.envs.cluster_simulator.deep_rm.internal.custom_type import (
_JOB_TYPE,
_JOBS_TYPE,
)
diff --git a/src/envs/cluster_simulator/deep_rm/internal/machines.py b/src/server_simulator/envs/cluster_simulator/deep_rm/internal/machines.py
similarity index 91%
rename from src/envs/cluster_simulator/deep_rm/internal/machines.py
rename to src/server_simulator/envs/cluster_simulator/deep_rm/internal/machines.py
index b60657a..f888fcc 100644
--- a/src/envs/cluster_simulator/deep_rm/internal/machines.py
+++ b/src/server_simulator/envs/cluster_simulator/deep_rm/internal/machines.py
@@ -1,12 +1,12 @@
import typing as tp
import numpy.typing as npt
-from src.envs.cluster_simulator.base.internal.machine import (
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
Machine,
MachineCollection,
MachinesCollectionConvertor,
)
-from src.envs.cluster_simulator.deep_rm.internal.custom_type import (
+from src.server_simulator.envs.cluster_simulator.deep_rm.internal.custom_type import (
_MACHINE_TYPE,
_MACHINES_TYPE,
)
diff --git a/src/envs/cluster_simulator/deep_rm/observation.py b/src/server_simulator/envs/cluster_simulator/deep_rm/observation.py
similarity index 91%
rename from src/envs/cluster_simulator/deep_rm/observation.py
rename to src/server_simulator/envs/cluster_simulator/deep_rm/observation.py
index 1253bf2..e813135 100644
--- a/src/envs/cluster_simulator/deep_rm/observation.py
+++ b/src/server_simulator/envs/cluster_simulator/deep_rm/observation.py
@@ -4,11 +4,11 @@
import numpy as np
import numpy.typing as npt
-from src.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.base.extractors.observation import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.base.extractors.observation import (
BaseObservationCreatorProtocol,
)
-from src.envs.cluster_simulator.deep_rm import (
+from src.server_simulator.envs.cluster_simulator.deep_rm import (
DeepRMCluster,
DeepRMMachinesConvertor,
DeepRMJobsConvertor,
diff --git a/src/envs/cluster_simulator/metric_based/__init__.py b/src/server_simulator/envs/cluster_simulator/metric_based/__init__.py
similarity index 92%
rename from src/envs/cluster_simulator/metric_based/__init__.py
rename to src/server_simulator/envs/cluster_simulator/metric_based/__init__.py
index 474eed5..8360640 100644
--- a/src/envs/cluster_simulator/metric_based/__init__.py
+++ b/src/server_simulator/envs/cluster_simulator/metric_based/__init__.py
@@ -2,24 +2,24 @@
import numpy as np
-from src.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.metric_based.internal.custom_type import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.custom_type import (
_JOBS_TYPE as _JOBS_TYPE,
_MACHINE_TYPE as _MACHINE_TYPE,
_DTYPE as _DTYPE,
)
-from src.envs.cluster_simulator.metric_based.internal.jobs import (
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.jobs import (
MetricJobSlot,
MetricJobs,
MetricJobsConvertor as MetricJobsConvertor,
)
-from src.envs.cluster_simulator.metric_based.internal.machines import (
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.machines import (
MetricMachine,
MetricMachines,
MetricMachinesConvertor as MetricMachinesConvertor,
)
-from src.envs.cluster_simulator.base.internal.cluster import ClusterABC
+from src.server_simulator.envs.cluster_simulator.base.internal.cluster import ClusterABC
class MetricCluster(ClusterABC[MetricMachines, MetricJobs]):
diff --git a/src/envs/cluster_simulator/metric_based/creator.py b/src/server_simulator/envs/cluster_simulator/metric_based/creator.py
similarity index 75%
rename from src/envs/cluster_simulator/metric_based/creator.py
rename to src/server_simulator/envs/cluster_simulator/metric_based/creator.py
index 6f075ac..042d041 100644
--- a/src/envs/cluster_simulator/metric_based/creator.py
+++ b/src/server_simulator/envs/cluster_simulator/metric_based/creator.py
@@ -1,15 +1,20 @@
from gymnasium.envs.registration import EnvCreator
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
BaceClusterInformationExtractor,
)
-from src.envs.cluster_simulator.base.extractors.reward import RewardCaculator
-from src.envs.cluster_simulator.basic import BasicClusterEnv
+from src.server_simulator.envs.cluster_simulator.base.extractors.reward import (
+ RewardCaculator,
+)
+from src.server_simulator.envs.cluster_simulator.basic import BasicClusterEnv
from typing import TypedDict, Optional
from typing_extensions import Unpack
-from src.envs.cluster_simulator.metric_based import MetricCluster, MetricClusterCreator
-from src.envs.cluster_simulator.metric_based.observation import (
+from src.server_simulator.envs.cluster_simulator.metric_based import (
+ MetricCluster,
+ MetricClusterCreator,
+)
+from src.server_simulator.envs.cluster_simulator.metric_based.observation import (
MetricClusterObservationCreator,
)
diff --git a/src/server_simulator/envs/cluster_simulator/metric_based/internal/__init__.py b/src/server_simulator/envs/cluster_simulator/metric_based/internal/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/envs/cluster_simulator/metric_based/internal/custom_type.py b/src/server_simulator/envs/cluster_simulator/metric_based/internal/custom_type.py
similarity index 100%
rename from src/envs/cluster_simulator/metric_based/internal/custom_type.py
rename to src/server_simulator/envs/cluster_simulator/metric_based/internal/custom_type.py
diff --git a/src/envs/cluster_simulator/metric_based/internal/dilation.py b/src/server_simulator/envs/cluster_simulator/metric_based/internal/dilation.py
similarity index 94%
rename from src/envs/cluster_simulator/metric_based/internal/dilation.py
rename to src/server_simulator/envs/cluster_simulator/metric_based/internal/dilation.py
index 4a32cd8..1bdcaf8 100644
--- a/src/envs/cluster_simulator/metric_based/internal/dilation.py
+++ b/src/server_simulator/envs/cluster_simulator/metric_based/internal/dilation.py
@@ -2,11 +2,11 @@
import numpy.typing as npt
import numpy as np
-from src.envs.cluster_simulator.base.internal.dilation import (
+from src.server_simulator.envs.cluster_simulator.base.internal.dilation import (
AbstractDilation,
SelectCellAction,
)
-from src.envs.cluster_simulator.utils.array_operations import (
+from src.server_simulator.envs.cluster_simulator.utils.array_operations import (
hierarchical_pooling,
get_window_from_cell,
)
diff --git a/src/envs/cluster_simulator/metric_based/internal/jobs.py b/src/server_simulator/envs/cluster_simulator/metric_based/internal/jobs.py
similarity index 93%
rename from src/envs/cluster_simulator/metric_based/internal/jobs.py
rename to src/server_simulator/envs/cluster_simulator/metric_based/internal/jobs.py
index 5387f20..88ec59b 100644
--- a/src/envs/cluster_simulator/metric_based/internal/jobs.py
+++ b/src/server_simulator/envs/cluster_simulator/metric_based/internal/jobs.py
@@ -4,13 +4,13 @@
import numpy as np
import numpy.typing as npt
-from src.envs.cluster_simulator.base.internal.job import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import (
Job,
Status,
JobCollection,
JobCollectionConvertor,
)
-from src.envs.cluster_simulator.metric_based.internal.custom_type import (
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.custom_type import (
_JOBS_TYPE,
_JOB_TYPE,
)
diff --git a/src/envs/cluster_simulator/metric_based/internal/machines.py b/src/server_simulator/envs/cluster_simulator/metric_based/internal/machines.py
similarity index 90%
rename from src/envs/cluster_simulator/metric_based/internal/machines.py
rename to src/server_simulator/envs/cluster_simulator/metric_based/internal/machines.py
index f6fa713..fe6e542 100644
--- a/src/envs/cluster_simulator/metric_based/internal/machines.py
+++ b/src/server_simulator/envs/cluster_simulator/metric_based/internal/machines.py
@@ -3,12 +3,12 @@
from typing_extensions import Unpack
import numpy.typing as npt
-from src.envs.cluster_simulator.base.internal.machine import (
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
Machine,
MachineCollection,
MachinesCollectionConvertor,
)
-from src.envs.cluster_simulator.metric_based.internal.custom_type import (
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.custom_type import (
_MACHINE_TYPE,
_MACHINES_TYPE,
)
diff --git a/src/envs/cluster_simulator/metric_based/observation.py b/src/server_simulator/envs/cluster_simulator/metric_based/observation.py
similarity index 84%
rename from src/envs/cluster_simulator/metric_based/observation.py
rename to src/server_simulator/envs/cluster_simulator/metric_based/observation.py
index a734310..ff4a0df 100644
--- a/src/envs/cluster_simulator/metric_based/observation.py
+++ b/src/server_simulator/envs/cluster_simulator/metric_based/observation.py
@@ -3,15 +3,17 @@
import gymnasium as gym
import numpy.typing as npt
-from src.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.base.extractors.observation import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.base.extractors.observation import (
BaseObservationCreatorProtocol,
)
import numpy as np
-from src.envs.cluster_simulator.metric_based import MetricCluster
-from src.envs.cluster_simulator.metric_based.internal.jobs import MetricJobsConvertor
-from src.envs.cluster_simulator.metric_based.internal.machines import (
+from src.server_simulator.envs.cluster_simulator.metric_based import MetricCluster
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.jobs import (
+ MetricJobsConvertor,
+)
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.machines import (
MetricMachinesConvertor,
)
diff --git a/src/envs/cluster_simulator/metric_based/renderer.py b/src/server_simulator/envs/cluster_simulator/metric_based/renderer.py
similarity index 97%
rename from src/envs/cluster_simulator/metric_based/renderer.py
rename to src/server_simulator/envs/cluster_simulator/metric_based/renderer.py
index dd50b55..707374b 100644
--- a/src/envs/cluster_simulator/metric_based/renderer.py
+++ b/src/server_simulator/envs/cluster_simulator/metric_based/renderer.py
@@ -2,19 +2,21 @@
from pygame import Color
-from src.envs.cluster_simulator.base.renderer import AbstractClusterGameRenderer
-from src.envs.cluster_simulator.metric_based.observation import (
+from src.server_simulator.envs.cluster_simulator.base.renderer import (
+ AbstractClusterGameRenderer,
+)
+from src.server_simulator.envs.cluster_simulator.metric_based.observation import (
MetricClusterObservation,
)
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
ClusterBaseInformation,
)
-from src.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
import numpy.typing as npt
import pygame
import numpy as np
-from src.wrappers.cluster_simulator.render_wrapper import RenderMode
+from src.server_simulator.wrappers.cluster_simulator.render_wrapper import RenderMode
class ClusterMetricRenderer(
diff --git a/src/envs/cluster_simulator/single_slot/__init__.py b/src/server_simulator/envs/cluster_simulator/single_slot/__init__.py
similarity index 91%
rename from src/envs/cluster_simulator/single_slot/__init__.py
rename to src/server_simulator/envs/cluster_simulator/single_slot/__init__.py
index 295bd95..30b215a 100644
--- a/src/envs/cluster_simulator/single_slot/__init__.py
+++ b/src/server_simulator/envs/cluster_simulator/single_slot/__init__.py
@@ -2,14 +2,14 @@
import numpy as np
-from src.envs.cluster_simulator.base.internal.cluster import ClusterABC
-from src.envs.cluster_simulator.single_slot.internal.jobs import (
+from src.server_simulator.envs.cluster_simulator.base.internal.cluster import ClusterABC
+from src.server_simulator.envs.cluster_simulator.single_slot.internal.jobs import (
SingleSlotJobs,
Status,
SingleSlotJob,
SingleSlotJobsConvertor as SingleSlotJobsConvertor,
)
-from src.envs.cluster_simulator.single_slot.internal.machines import (
+from src.server_simulator.envs.cluster_simulator.single_slot.internal.machines import (
SingleSlotMachines,
SingleSlotMachine,
SingleSlotMachinesConvertor as SingleSlotMachinesConvertor,
diff --git a/src/envs/cluster_simulator/single_slot/creator.py b/src/server_simulator/envs/cluster_simulator/single_slot/creator.py
similarity index 74%
rename from src/envs/cluster_simulator/single_slot/creator.py
rename to src/server_simulator/envs/cluster_simulator/single_slot/creator.py
index 63e66ed..4c010b5 100644
--- a/src/envs/cluster_simulator/single_slot/creator.py
+++ b/src/server_simulator/envs/cluster_simulator/single_slot/creator.py
@@ -1,18 +1,20 @@
from gymnasium.envs.registration import EnvCreator
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
BaceClusterInformationExtractor,
)
-from src.envs.cluster_simulator.base.extractors.reward import RewardCaculator
-from src.envs.cluster_simulator.basic import BasicClusterEnv
+from src.server_simulator.envs.cluster_simulator.base.extractors.reward import (
+ RewardCaculator,
+)
+from src.server_simulator.envs.cluster_simulator.basic import BasicClusterEnv
from typing import TypedDict, Optional
from typing_extensions import Unpack
-from src.envs.cluster_simulator.single_slot import (
+from src.server_simulator.envs.cluster_simulator.single_slot import (
SingleSlotCluster,
SingleSlotClusterCreators,
)
-from src.envs.cluster_simulator.single_slot.observation import (
+from src.server_simulator.envs.cluster_simulator.single_slot.observation import (
SingleSlotObservationCreator,
)
diff --git a/src/server_simulator/envs/cluster_simulator/single_slot/internal/__init__.py b/src/server_simulator/envs/cluster_simulator/single_slot/internal/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/envs/cluster_simulator/single_slot/internal/jobs.py b/src/server_simulator/envs/cluster_simulator/single_slot/internal/jobs.py
similarity index 94%
rename from src/envs/cluster_simulator/single_slot/internal/jobs.py
rename to src/server_simulator/envs/cluster_simulator/single_slot/internal/jobs.py
index 2467dfd..a7b8671 100644
--- a/src/envs/cluster_simulator/single_slot/internal/jobs.py
+++ b/src/server_simulator/envs/cluster_simulator/single_slot/internal/jobs.py
@@ -1,6 +1,6 @@
import numpy as np
-from src.envs.cluster_simulator.base.internal.job import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import (
Job,
JobCollection,
Status,
diff --git a/src/envs/cluster_simulator/single_slot/internal/machines.py b/src/server_simulator/envs/cluster_simulator/single_slot/internal/machines.py
similarity index 94%
rename from src/envs/cluster_simulator/single_slot/internal/machines.py
rename to src/server_simulator/envs/cluster_simulator/single_slot/internal/machines.py
index ef912eb..caab1e9 100644
--- a/src/envs/cluster_simulator/single_slot/internal/machines.py
+++ b/src/server_simulator/envs/cluster_simulator/single_slot/internal/machines.py
@@ -2,7 +2,7 @@
from typing import TypeAlias
from typing_extensions import Unpack
import numpy as np
-from src.envs.cluster_simulator.base.internal.machine import (
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
Machine,
MachineCollection,
MachinesCollectionConvertor,
diff --git a/src/envs/cluster_simulator/single_slot/observation.py b/src/server_simulator/envs/cluster_simulator/single_slot/observation.py
similarity index 90%
rename from src/envs/cluster_simulator/single_slot/observation.py
rename to src/server_simulator/envs/cluster_simulator/single_slot/observation.py
index 193471f..7b8d290 100644
--- a/src/envs/cluster_simulator/single_slot/observation.py
+++ b/src/server_simulator/envs/cluster_simulator/single_slot/observation.py
@@ -2,11 +2,11 @@
import gymnasium as gym
-from src.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.base.extractors.observation import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.base.extractors.observation import (
BaseObservationCreatorProtocol,
)
-from src.envs.cluster_simulator.single_slot import (
+from src.server_simulator.envs.cluster_simulator.single_slot import (
SingleSlotCluster,
SingleSlotMachinesConvertor,
SingleSlotJobsConvertor,
diff --git a/src/server_simulator/envs/cluster_simulator/utils/__init__.py b/src/server_simulator/envs/cluster_simulator/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/envs/cluster_simulator/utils/array_operations.py b/src/server_simulator/envs/cluster_simulator/utils/array_operations.py
similarity index 100%
rename from src/envs/cluster_simulator/utils/array_operations.py
rename to src/server_simulator/envs/cluster_simulator/utils/array_operations.py
diff --git a/src/scheduler/__init__.py b/src/server_simulator/scheduler/__init__.py
similarity index 100%
rename from src/scheduler/__init__.py
rename to src/server_simulator/scheduler/__init__.py
diff --git a/src/scheduler/base_scheduler.py b/src/server_simulator/scheduler/base_scheduler.py
similarity index 81%
rename from src/scheduler/base_scheduler.py
rename to src/server_simulator/scheduler/base_scheduler.py
index 8e8e53e..71fa4a8 100644
--- a/src/scheduler/base_scheduler.py
+++ b/src/server_simulator/scheduler/base_scheduler.py
@@ -2,8 +2,15 @@
import typing as tp
import abc
-from src.envs.cluster_simulator.base.internal.job import JobCollection, Job, Status
-from src.envs.cluster_simulator.base.internal.machine import MachineCollection, Machine
+from src.server_simulator.envs.cluster_simulator.base.internal.job import (
+ JobCollection,
+ Job,
+ Status,
+)
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
+ MachineCollection,
+ Machine,
+)
T = tp.TypeVar("T")
MachineT = tp.TypeVar("MachineT", bound=Machine)
diff --git a/src/scheduler/first_come_first_served_scheduler.py b/src/server_simulator/scheduler/first_come_first_served_scheduler.py
similarity index 77%
rename from src/scheduler/first_come_first_served_scheduler.py
rename to src/server_simulator/scheduler/first_come_first_served_scheduler.py
index 3e14da9..ed0e0f4 100644
--- a/src/scheduler/first_come_first_served_scheduler.py
+++ b/src/server_simulator/scheduler/first_come_first_served_scheduler.py
@@ -1,8 +1,10 @@
import typing as tp
-from src.envs.cluster_simulator.base.internal.job import JobCollection
-from src.envs.cluster_simulator.base.internal.machine import MachineCollection
-from src.scheduler.base_scheduler import ABCScheduler
+from src.server_simulator.envs.cluster_simulator.base.internal.job import JobCollection
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
+ MachineCollection,
+)
+from src.server_simulator.scheduler.base_scheduler import ABCScheduler
T = tp.TypeVar("T")
diff --git a/src/scheduler/random_scheduler.py b/src/server_simulator/scheduler/random_scheduler.py
similarity index 81%
rename from src/scheduler/random_scheduler.py
rename to src/server_simulator/scheduler/random_scheduler.py
index f5d434f..86e1542 100644
--- a/src/scheduler/random_scheduler.py
+++ b/src/server_simulator/scheduler/random_scheduler.py
@@ -2,9 +2,11 @@
import random
import numpy as np
-from src.envs.cluster_simulator.base.internal.job import JobCollection
-from src.envs.cluster_simulator.base.internal.machine import MachineCollection
-from src.scheduler.base_scheduler import ABCScheduler, T
+from src.server_simulator.envs.cluster_simulator.base.internal.job import JobCollection
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
+ MachineCollection,
+)
+from src.server_simulator.scheduler.base_scheduler import ABCScheduler, T
class RandomScheduler(ABCScheduler[T]):
diff --git a/src/scheduler/round_robin_scheduler.py b/src/server_simulator/scheduler/round_robin_scheduler.py
similarity index 85%
rename from src/scheduler/round_robin_scheduler.py
rename to src/server_simulator/scheduler/round_robin_scheduler.py
index 244f16d..e98291e 100644
--- a/src/scheduler/round_robin_scheduler.py
+++ b/src/server_simulator/scheduler/round_robin_scheduler.py
@@ -1,8 +1,10 @@
import typing as tp
-from src.envs.cluster_simulator.base.internal.job import JobCollection
-from src.envs.cluster_simulator.base.internal.machine import MachineCollection
-from src.scheduler.base_scheduler import ABCScheduler
+from src.server_simulator.envs.cluster_simulator.base.internal.job import JobCollection
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
+ MachineCollection,
+)
+from src.server_simulator.scheduler.base_scheduler import ABCScheduler
T = tp.TypeVar("T")
diff --git a/src/scheduler/shortest_job_first_scheduler.py b/src/server_simulator/scheduler/shortest_job_first_scheduler.py
similarity index 83%
rename from src/scheduler/shortest_job_first_scheduler.py
rename to src/server_simulator/scheduler/shortest_job_first_scheduler.py
index dfe23a4..2751d96 100644
--- a/src/scheduler/shortest_job_first_scheduler.py
+++ b/src/server_simulator/scheduler/shortest_job_first_scheduler.py
@@ -1,8 +1,10 @@
import typing as tp
-from src.envs.cluster_simulator.base.internal.job import JobCollection
-from src.envs.cluster_simulator.base.internal.machine import MachineCollection
-from src.scheduler.base_scheduler import ABCScheduler
+from src.server_simulator.envs.cluster_simulator.base.internal.job import JobCollection
+from src.server_simulator.envs.cluster_simulator.base.internal.machine import (
+ MachineCollection,
+)
+from src.server_simulator.scheduler.base_scheduler import ABCScheduler
T = tp.TypeVar("T")
diff --git a/src/server_simulator/wrappers/__init__.py b/src/server_simulator/wrappers/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/server_simulator/wrappers/cluster_simulator/__init__.py b/src/server_simulator/wrappers/cluster_simulator/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/wrappers/cluster_simulator/dilation_wrapper.py b/src/server_simulator/wrappers/cluster_simulator/dilation_wrapper.py
similarity index 92%
rename from src/wrappers/cluster_simulator/dilation_wrapper.py
rename to src/server_simulator/wrappers/cluster_simulator/dilation_wrapper.py
index 3884ea2..4ebadac 100644
--- a/src/wrappers/cluster_simulator/dilation_wrapper.py
+++ b/src/server_simulator/wrappers/cluster_simulator/dilation_wrapper.py
@@ -6,17 +6,22 @@
import numpy as np
-from src.envs.cluster_simulator.base.internal.dilation import (
+from src.server_simulator.envs import BasicClusterEnv
+from src.server_simulator.envs.cluster_simulator.actions import (
+ EnvironmentAction,
+ DilationEnvironmentAction,
+)
+from src.server_simulator.envs.cluster_simulator.base.extractors.observation import (
+ BaseClusterObservation,
+)
+from src.server_simulator.envs.cluster_simulator.base.internal.dilation import (
AbstractDilation,
DilationAction,
DilationState,
AbstractDilationParams,
)
-from src.envs.cluster_simulator.actions import DilationEnvironmentAction
-from src.envs.cluster_simulator.basic import BasicClusterEnv, EnvironmentAction
-from src.envs.cluster_simulator.base.extractors.information import ClusterInformation
-from src.envs.cluster_simulator.base.extractors.observation import (
- BaseClusterObservation,
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
+ ClusterInformation,
)
EnvironmentObservation = TypeVar("EnvironmentObservation", bound=BaseClusterObservation)
diff --git a/src/wrappers/cluster_simulator/render_wrapper.py b/src/server_simulator/wrappers/cluster_simulator/render_wrapper.py
similarity index 83%
rename from src/wrappers/cluster_simulator/render_wrapper.py
rename to src/server_simulator/wrappers/cluster_simulator/render_wrapper.py
index 9cacd72..4f24ce5 100644
--- a/src/wrappers/cluster_simulator/render_wrapper.py
+++ b/src/server_simulator/wrappers/cluster_simulator/render_wrapper.py
@@ -3,15 +3,17 @@
import gymnasium as gym
from gymnasium.core import WrapperActType, WrapperObsType, RenderFrame
-from src.envs import BasicClusterEnv
-from src.envs.cluster_simulator.actions import EnvironmentAction
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs import BasicClusterEnv
+from src.server_simulator.envs.cluster_simulator import EnvironmentAction
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
ClusterBaseInformation,
)
-from src.envs.cluster_simulator.base.extractors.observation import (
+from src.server_simulator.envs.cluster_simulator import (
BaseClusterObservation,
)
-from src.envs.cluster_simulator.base.renderer import AbstractClusterGameRenderer
+from src.server_simulator.envs.cluster_simulator.base.renderer import (
+ AbstractClusterGameRenderer,
+)
EnvironmentObservation = TypeVar("EnvironmentObservation", bound=BaseClusterObservation)
WrapperObservation = TypeVar("WrapperObservation", bound=BaseClusterObservation)
diff --git a/tests/strategies/cluster_strategies/deeprm_st.py b/tests/strategies/cluster_strategies/deeprm_st.py
index b94ad14..06652df 100644
--- a/tests/strategies/cluster_strategies/deeprm_st.py
+++ b/tests/strategies/cluster_strategies/deeprm_st.py
@@ -1,7 +1,10 @@
from hypothesis import strategies as st
from hypothesis.strategies import SearchStrategy
-from src.envs.cluster_simulator.deep_rm import DeepRMCreators, DeepRMCluster
+from src.server_simulator.envs.cluster_simulator.deep_rm import (
+ DeepRMCluster,
+ DeepRMCreators,
+)
from tests.strategies.cluster_strategies.proto import ClusterStrategies
diff --git a/tests/strategies/cluster_strategies/metric_st.py b/tests/strategies/cluster_strategies/metric_st.py
index 2d5eb32..9b03ebf 100644
--- a/tests/strategies/cluster_strategies/metric_st.py
+++ b/tests/strategies/cluster_strategies/metric_st.py
@@ -1,7 +1,10 @@
from hypothesis import strategies as st
from hypothesis.strategies import SearchStrategy
-from src.envs.cluster_simulator.metric_based import MetricCluster, MetricClusterCreator
+from src.server_simulator.envs.cluster_simulator.metric_based import (
+ MetricCluster,
+ MetricClusterCreator,
+)
from tests.strategies.cluster_strategies.proto import ClusterStrategies
diff --git a/tests/strategies/cluster_strategies/proto.py b/tests/strategies/cluster_strategies/proto.py
index e32aa3a..48c0580 100644
--- a/tests/strategies/cluster_strategies/proto.py
+++ b/tests/strategies/cluster_strategies/proto.py
@@ -3,10 +3,10 @@
from hypothesis.strategies import SearchStrategy
-from src.envs.cluster_simulator.base.internal.cluster import ClusterABC
-from src.envs.cluster_simulator.base.extractors.observation import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.observation import (
BaseObservationCreatorProtocol,
)
+from src.server_simulator.envs.cluster_simulator.base.internal.cluster import ClusterABC
Cluster = TypeVar("Cluster", bound=ClusterABC)
Creator = TypeVar("Creator", bound=BaseObservationCreatorProtocol)
diff --git a/tests/strategies/cluster_strategies/single_slot_st.py b/tests/strategies/cluster_strategies/single_slot_st.py
index 93e62ce..ff305bb 100644
--- a/tests/strategies/cluster_strategies/single_slot_st.py
+++ b/tests/strategies/cluster_strategies/single_slot_st.py
@@ -2,7 +2,7 @@
from hypothesis import strategies as st
from tests.strategies.cluster_strategies.proto import ClusterStrategies
-from src.envs.cluster_simulator.single_slot import (
+from src.server_simulator.envs.cluster_simulator.single_slot import (
SingleSlotCluster,
SingleSlotClusterCreators,
)
diff --git a/tests/strategies/dilation_strategies/metric_cluster_dilator_st.py b/tests/strategies/dilation_strategies/metric_cluster_dilator_st.py
index dc81b8e..2642dd6 100644
--- a/tests/strategies/dilation_strategies/metric_cluster_dilator_st.py
+++ b/tests/strategies/dilation_strategies/metric_cluster_dilator_st.py
@@ -5,18 +5,22 @@
from hypothesis import strategies as st, assume
import numpy as np
-from src.envs.cluster_simulator.metric_based.internal.dilation import MetricBasedDilator
-from src.envs import BasicClusterEnv
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs import (
+ BasicClusterEnv,
+ DifferentInPendingJobsRewardCaculator,
+)
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
BaceClusterInformationExtractor,
)
-from src.envs.cluster_simulator.metric_based.observation import (
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.dilation import (
+ MetricBasedDilator,
+)
+from src.server_simulator.envs.cluster_simulator.metric_based.observation import (
MetricClusterObservationCreator,
)
-from src.envs.cluster_simulator.base.extractors.reward import (
- DifferentInPendingJobsRewardCaculator,
+from src.server_simulator.wrappers.cluster_simulator.dilation_wrapper import (
+ DilatorWrapper,
)
-from src.wrappers.cluster_simulator.dilation_wrapper import DilatorWrapper
from tests.strategies.cluster_strategies import MetricClusterStrategies
from tests.strategies.dilation_strategies.proto import DilationStrategies, Dilator
diff --git a/tests/strategies/dilation_strategies/proto.py b/tests/strategies/dilation_strategies/proto.py
index e1f4713..4018418 100644
--- a/tests/strategies/dilation_strategies/proto.py
+++ b/tests/strategies/dilation_strategies/proto.py
@@ -3,7 +3,9 @@
from hypothesis.strategies import SearchStrategy
-from src.envs.cluster_simulator.base.internal.dilation import AbstractDilation
+from src.server_simulator.envs.cluster_simulator.base.internal.dilation import (
+ AbstractDilation,
+)
Dilator = TypeVar("Dilator", bound=AbstractDilation)
diff --git a/tests/strategies/env_strategies/basic_env_st.py b/tests/strategies/env_strategies/basic_env_st.py
index 7e94c4a..501421d 100644
--- a/tests/strategies/env_strategies/basic_env_st.py
+++ b/tests/strategies/env_strategies/basic_env_st.py
@@ -1,22 +1,22 @@
from hypothesis import strategies as st, assume
from typing import TYPE_CHECKING, TypedDict
-from src.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.single_slot import SingleSlotCluster
-from src.envs import BasicClusterEnv
-from src.envs.cluster_simulator.base.extractors.information import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.single_slot import SingleSlotCluster
+from src.server_simulator.envs import BasicClusterEnv
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
BaceClusterInformationExtractor,
)
-from src.envs.cluster_simulator.deep_rm.observation import (
+from src.server_simulator.envs.cluster_simulator.deep_rm.creator import (
DeepRMObservationCreator,
)
-from src.envs.cluster_simulator.metric_based.observation import (
+from src.server_simulator.envs.cluster_simulator.metric_based.observation import (
MetricClusterObservationCreator,
)
-from src.envs.cluster_simulator.single_slot.observation import (
+from src.server_simulator.envs.cluster_simulator.single_slot.observation import (
SingleSlotObservationCreator,
)
-from src.envs.cluster_simulator.base.extractors.reward import (
+from src.server_simulator.envs.cluster_simulator.base.extractors.reward import (
DifferentInPendingJobsRewardCaculator,
)
from tests.strategies.cluster_strategies import (
diff --git a/tests/test_e2e/test_e2e_deeprm.py b/tests/test_e2e/test_e2e_deeprm.py
index 948ccb3..d7b880d 100644
--- a/tests/test_e2e/test_e2e_deeprm.py
+++ b/tests/test_e2e/test_e2e_deeprm.py
@@ -1,6 +1,7 @@
import gymnasium as gym
from gymnasium.utils.env_checker import check_env
-from src import envs # noqa: F401
+import src.server_simulator.envs # noqa: F401
+
env = gym.make("ClusterScheduling-deeprm-v1").unwrapped
check_env(env)
diff --git a/tests/test_e2e/test_e2e_matric_based.py b/tests/test_e2e/test_e2e_matric_based.py
index 349f452..11909e8 100644
--- a/tests/test_e2e/test_e2e_matric_based.py
+++ b/tests/test_e2e/test_e2e_matric_based.py
@@ -1,6 +1,6 @@
import gymnasium as gym
from gymnasium.utils.env_checker import check_env
-from src import envs # noqa: F401
+import src.server_simulator.envs # noqa: F401
env = gym.make("ClusterScheduling-metric-online-v1").unwrapped
check_env(env)
diff --git a/tests/test_e2e/test_e2e_single_slot.py b/tests/test_e2e/test_e2e_single_slot.py
index 42cc7b2..57c9532 100644
--- a/tests/test_e2e/test_e2e_single_slot.py
+++ b/tests/test_e2e/test_e2e_single_slot.py
@@ -1,6 +1,6 @@
import gymnasium as gym
from gymnasium.utils.env_checker import check_env
-from src import envs # noqa: F401
+import src.server_simulator # noqa: F401
env = gym.make("ClusterScheduling-single-slot-v1").unwrapped
check_env(env)
diff --git a/tests/test_envs/test_basic_env.py b/tests/test_envs/test_basic_env.py
index 58e94a3..87c9a99 100644
--- a/tests/test_envs/test_basic_env.py
+++ b/tests/test_envs/test_basic_env.py
@@ -3,15 +3,17 @@
import numpy as np
-from src.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.basic import BasicClusterEnv
+from src.server_simulator.envs import BasicClusterEnv
+from src.server_simulator.envs.cluster_simulator.actions import EnvironmentAction
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
from hypothesis import given, settings
-from src.envs.cluster_simulator.base.extractors.information import ClusterInformation
-from src.envs.cluster_simulator.base.extractors.observation import ClusterObservation
-from src.scheduler.random_scheduler import RandomScheduler
+from src.server_simulator.envs.cluster_simulator.base.extractors.information import (
+ ClusterInformation,
+)
+from src.server_simulator.envs.cluster_simulator.base.renderer import ClusterObservation
+from src.server_simulator.scheduler import RandomScheduler
from tests.strategies.env_strategies.basic_env_st import BasicGymEnvironmentStrategies
-from src.envs.cluster_simulator.basic import EnvironmentAction
@given(env=BasicGymEnvironmentStrategies.creation())
diff --git a/tests/test_envs/test_cluster_simulator/test_deep_rm/test_deeprm_cluster.py b/tests/test_envs/test_cluster_simulator/test_deep_rm/test_deeprm_cluster.py
index 4be6692..bfc79a7 100644
--- a/tests/test_envs/test_cluster_simulator/test_deep_rm/test_deeprm_cluster.py
+++ b/tests/test_envs/test_cluster_simulator/test_deep_rm/test_deeprm_cluster.py
@@ -1,9 +1,12 @@
-from src.envs.cluster_simulator.deep_rm.internal.jobs import DeepRMJobsConvertor
-from src.envs.cluster_simulator.deep_rm.internal.machines import DeepRMMachinesConvertor
-from src.scheduler.random_scheduler import RandomScheduler
+from src.server_simulator.envs.cluster_simulator.deep_rm import (
+ DeepRMJobsConvertor,
+ DeepRMMachinesConvertor,
+ DeepRMCluster,
+ DeepRMCreators,
+)
+from src.server_simulator.scheduler import RandomScheduler
from hypothesis import given, strategies as st, assume, settings, HealthCheck
-from src.envs.cluster_simulator.deep_rm import DeepRMCreators, DeepRMCluster
-from src.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
import numpy as np
import pytest
diff --git a/tests/test_envs/test_cluster_simulator/test_metric_based/test_metric_cluster.py b/tests/test_envs/test_cluster_simulator/test_metric_based/test_metric_cluster.py
index 4e56c05..fdf45b3 100644
--- a/tests/test_envs/test_cluster_simulator/test_metric_based/test_metric_cluster.py
+++ b/tests/test_envs/test_cluster_simulator/test_metric_based/test_metric_cluster.py
@@ -1,9 +1,9 @@
import pytest
-from src.envs.cluster_simulator.base.internal.job import Status
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
import numpy as np
-from src.envs.cluster_simulator.metric_based import (
+from src.server_simulator.envs.cluster_simulator.metric_based import (
MetricClusterCreator,
MetricCluster,
MetricJobsConvertor,
@@ -11,7 +11,7 @@
)
from hypothesis import given, strategies as st, assume, settings, HealthCheck
-from src.scheduler.random_scheduler import RandomScheduler
+from src.server_simulator.scheduler import RandomScheduler
from tests.strategies.cluster_strategies import MetricClusterStrategies
from tests.test_envs.test_cluster_simulator.test_single_slot.test_single_slot_cluster import (
seed_strategy,
diff --git a/tests/test_envs/test_cluster_simulator/test_metric_based/tests_metric_dilation.py b/tests/test_envs/test_cluster_simulator/test_metric_based/tests_metric_dilation.py
index fc921bc..0a53fbd 100644
--- a/tests/test_envs/test_cluster_simulator/test_metric_based/tests_metric_dilation.py
+++ b/tests/test_envs/test_cluster_simulator/test_metric_based/tests_metric_dilation.py
@@ -1,6 +1,8 @@
-from src.envs.cluster_simulator.base.internal.dilation import DilationState
-from src.envs.cluster_simulator.metric_based.internal.dilation import MetricBasedDilator
-from src.envs.cluster_simulator.utils import array_operations
+from src.server_simulator.envs.cluster_simulator.base.internal.dilation import (
+ DilationState,
+)
+from src.server_simulator.envs.cluster_simulator import MetricBasedDilator
+from src.server_simulator.envs.cluster_simulator.utils import array_operations
import numpy as np
from hypothesis import given, strategies as st, assume, settings, HealthCheck
diff --git a/tests/test_envs/test_cluster_simulator/test_single_slot/test_single_slot_cluster.py b/tests/test_envs/test_cluster_simulator/test_single_slot/test_single_slot_cluster.py
index aebf3db..f5ae101 100644
--- a/tests/test_envs/test_cluster_simulator/test_single_slot/test_single_slot_cluster.py
+++ b/tests/test_envs/test_cluster_simulator/test_single_slot/test_single_slot_cluster.py
@@ -1,9 +1,13 @@
import numpy as np
import pytest
-from src.envs.cluster_simulator.base.internal.job import Status as JobStatus
-from src.envs.cluster_simulator.single_slot.internal.jobs import SingleSlotJobsConvertor
-from src.envs.cluster_simulator.single_slot.internal.machines import (
+from src.server_simulator.envs.cluster_simulator.base.internal.job import (
+ Status as JobStatus,
+)
+from src.server_simulator.envs.cluster_simulator.single_slot.internal.jobs import (
+ SingleSlotJobsConvertor,
+)
+from src.server_simulator.envs.cluster_simulator.single_slot.internal.machines import (
SingleSlotMachinesConvertor,
)
from tests.test_envs.test_cluster_simulator.test_single_slot.utils import (
diff --git a/tests/test_envs/test_cluster_simulator/test_single_slot/utils.py b/tests/test_envs/test_cluster_simulator/test_single_slot/utils.py
index a8b4560..4ef7a16 100644
--- a/tests/test_envs/test_cluster_simulator/test_single_slot/utils.py
+++ b/tests/test_envs/test_cluster_simulator/test_single_slot/utils.py
@@ -1,4 +1,4 @@
-from src.envs.cluster_simulator.single_slot import (
+from src.server_simulator.envs.cluster_simulator.single_slot import (
SingleSlotCluster,
SingleSlotClusterCreators,
)
diff --git a/tests/test_envs/test_cluster_simulator/test_utils/test_array_operations.py b/tests/test_envs/test_cluster_simulator/test_utils/test_array_operations.py
index ee55dc3..df840c1 100644
--- a/tests/test_envs/test_cluster_simulator/test_utils/test_array_operations.py
+++ b/tests/test_envs/test_cluster_simulator/test_utils/test_array_operations.py
@@ -6,7 +6,7 @@
from hypothesis import given, assume, HealthCheck, settings
import numpy.typing as npt
import typing as tp
-from src.envs.cluster_simulator.utils import array_operations
+from src.server_simulator.envs.cluster_simulator.utils import array_operations
kernel_strategy = st.tuples(
st.integers(min_value=2, max_value=5), st.integers(min_value=2, max_value=5)
diff --git a/tests/test_wrappers/test_dilation_wrapper.py b/tests/test_wrappers/test_dilation_wrapper.py
index bd5c181..13ade54 100644
--- a/tests/test_wrappers/test_dilation_wrapper.py
+++ b/tests/test_wrappers/test_dilation_wrapper.py
@@ -3,23 +3,27 @@
import numpy as np
-from src.envs.cluster_simulator.base.internal.job import Status
-from src.envs.cluster_simulator.metric_based.internal.dilation import MetricBasedDilator
-from src.wrappers.cluster_simulator.dilation_wrapper import (
- DilatorWrapper,
+from src.server_simulator.envs.cluster_simulator.actions import (
DilationEnvironmentAction,
)
+from src.server_simulator.envs.cluster_simulator.base.internal.job import Status
from typing import Tuple, Type
from hypothesis import given, settings, HealthCheck, assume
-from src.envs.cluster_simulator.base.internal.dilation import (
+from src.server_simulator.envs.cluster_simulator.base.internal.dilation import (
AbstractDilation,
DilationState,
)
-from src.scheduler.random_scheduler import RandomScheduler
+from src.server_simulator.envs.cluster_simulator.metric_based import MetricMachines
+from src.server_simulator.envs.cluster_simulator.metric_based.internal.dilation import (
+ MetricBasedDilator,
+)
+from src.server_simulator.scheduler import RandomScheduler
+from src.server_simulator.wrappers.cluster_simulator.dilation_wrapper import (
+ DilatorWrapper,
+)
from tests.strategies.dilation_strategies.metric_cluster_dilator_st import (
MetricClusterDilationStrategies,
)
-from src.envs.cluster_simulator.metric_based import MetricMachines
import numpy.typing as npt
DILATOR_CLASS_OPTIONS: Tuple[Type[AbstractDilation], ...] = (MetricBasedDilator,)