Skip to content

Change project layout #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dev0Guy merged 6 commits into from
Mar 21, 2026
Merged

Change project layout #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c1fe26
update pygame version
dev0Guy Mar 21, 2026
c7247e2
add import
dev0Guy Mar 21, 2026
23904d9
add import
dev0Guy Mar 21, 2026
ee30514
add import
dev0Guy Mar 21, 2026
f38bbb8
add import
dev0Guy Mar 21, 2026
7774f26
add import
dev0Guy Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/server-simulator.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"]
Expand Down
0 src/envs/cluster_simulator/__init__.py → src/server_simulator/__init__.py
View file
Open in desktop
File renamed without changes.
12 changes: 7 additions & 5 deletions src/envs/__init__.py → src/server_simulator/envs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
)
Expand Down
0 src/envs/cluster_simulator/base/__init__.py → ...ulator/envs/cluster_simulator/__init__.py
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion src/envs/cluster_simulator/actions.py → ...mulator/envs/cluster_simulator/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
0 ...ter_simulator/base/extractors/__init__.py → ...r/envs/cluster_simulator/base/__init__.py
View file
Open in desktop
File renamed without changes.
0 src/envs/cluster_simulator/utils/__init__.py → ...ter_simulator/base/extractors/__init__.py
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ..._simulator/base/extractors/information.py → ..._simulator/base/extractors/information.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 7 additions & 3 deletions ..._simulator/base/extractors/observation.py → ..._simulator/base/extractors/observation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 4 additions & 2 deletions ...uster_simulator/base/extractors/reward.py → ...uster_simulator/base/extractors/reward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
0 src/wrappers/cluster_simulator/__init__.py → ...uster_simulator/base/internal/__init__.py
View file
Open in desktop
File renamed without changes.
14 changes: 11 additions & 3 deletions ...luster_simulator/base/internal/cluster.py → ...luster_simulator/base/internal/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
0 ...uster_simulator/base/internal/dilation.py → ...uster_simulator/base/internal/dilation.py
View file
Open in desktop
File renamed without changes.
0 ...vs/cluster_simulator/base/internal/job.py → ...vs/cluster_simulator/base/internal/job.py
View file
Open in desktop
File renamed without changes.
0 ...luster_simulator/base/internal/machine.py → ...luster_simulator/base/internal/machine.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/envs/cluster_simulator/base/renderer.py → ...r/envs/cluster_simulator/base/renderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 10 additions & 5 deletions src/envs/cluster_simulator/basic.py → ...simulator/envs/cluster_simulator/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions ...nvs/cluster_simulator/deep_rm/__init__.py → ...nvs/cluster_simulator/deep_rm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]):
Expand Down
17 changes: 12 additions & 5 deletions ...envs/cluster_simulator/deep_rm/creator.py → ...envs/cluster_simulator/deep_rm/creator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]

Expand Down
Empty file added src/server_simulator/envs/cluster_simulator/deep_rm/internal/__init__.py
View file
Open in desktop
Empty file.
0 ...simulator/deep_rm/internal/custom_type.py → ...simulator/deep_rm/internal/custom_type.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...luster_simulator/deep_rm/internal/jobs.py → ...luster_simulator/deep_rm/internal/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
4 changes: 2 additions & 2 deletions ...er_simulator/deep_rm/internal/machines.py → ...er_simulator/deep_rm/internal/machines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
)
Expand Down
6 changes: 3 additions & 3 deletions .../cluster_simulator/deep_rm/observation.py → .../cluster_simulator/deep_rm/observation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions ...luster_simulator/metric_based/__init__.py → ...luster_simulator/metric_based/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]):
Expand Down
15 changes: 10 additions & 5 deletions ...cluster_simulator/metric_based/creator.py → ...cluster_simulator/metric_based/creator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
)

Expand Down
Empty file added src/server_simulator/envs/cluster_simulator/metric_based/internal/__init__.py
View file
Open in desktop
Empty file.
0 ...ator/metric_based/internal/custom_type.py → ...ator/metric_based/internal/custom_type.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...mulator/metric_based/internal/dilation.py → ...mulator/metric_based/internal/dilation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
4 changes: 2 additions & 2 deletions ...r_simulator/metric_based/internal/jobs.py → ...r_simulator/metric_based/internal/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
4 changes: 2 additions & 2 deletions ...mulator/metric_based/internal/machines.py → ...mulator/metric_based/internal/machines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
Loading
Loading