Merge pull request #114 from traP-jp/refactor/#113-workspace-structure

🎨 divide crates into app, lib and pylib
traP-jp · Feb 18, 2025 · 7e91e59 · 7e91e59
2 parents 07f743d + 13c7666
commit 7e91e59
Show file tree

Hide file tree

Showing 86 changed files with 46 additions and 35 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,10 +29,11 @@ pyo3-stub-gen = "0.7.0"
 
 [workspace]
 members = [
-    "judge_control_app",
-    "writerutil",
-    "grpc_schema",
-    "judge_core",
-    "traopy",
+    "lib/jobapi",
+    "lib/local_jobapi",
+    "lib/grpc_schema",
+    "lib/judge_core",
+    "pylib/traopy", 
+    "app/judge_control_app",
 ]
 resolver = "2"
diff --git a/app/judge_control_app/Cargo.toml b/app/judge_control_app/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "judge_control_app"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
diff --git a/writerutil/src/main.rs → app/judge_control_app/src/main.rs b/writerutil/src/main.rs → app/judge_control_app/src/main.rs
@@ -1,4 +1,3 @@
-use anyhow::Result;
 fn main() {
     println!("Hello, world!");
 }
diff --git a/judge_control_app/src/main.rs b/judge_control_app/src/main.rs
diff --git a/grpc_schema/Cargo.toml → lib/grpc_schema/Cargo.toml b/grpc_schema/Cargo.toml → lib/grpc_schema/Cargo.toml
diff --git a/grpc_schema/build.rs → lib/grpc_schema/build.rs b/grpc_schema/build.rs → lib/grpc_schema/build.rs
diff --git a/grpc_schema/src/_.rs → lib/grpc_schema/src/_.rs b/grpc_schema/src/_.rs → lib/grpc_schema/src/_.rs
diff --git a/grpc_schema/src/lib.rs → lib/grpc_schema/src/lib.rs b/grpc_schema/src/lib.rs → lib/grpc_schema/src/lib.rs
diff --git a/judge_control_app/Cargo.toml → lib/jobapi/Cargo.toml b/judge_control_app/Cargo.toml → lib/jobapi/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "judge_control_app"
+name = "jobapi"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/judge_control_app/src/alert.rs → lib/jobapi/src/alert.rs b/judge_control_app/src/alert.rs → lib/jobapi/src/alert.rs
diff --git a/judge_control_app/src/container.rs → lib/jobapi/src/container.rs b/judge_control_app/src/container.rs → lib/jobapi/src/container.rs
diff --git a/judge_control_app/src/custom_rc.rs → lib/jobapi/src/custom_rc.rs b/judge_control_app/src/custom_rc.rs → lib/jobapi/src/custom_rc.rs
diff --git a/judge_control_app/src/custom_rc/entity.rs → lib/jobapi/src/custom_rc/entity.rs b/judge_control_app/src/custom_rc/entity.rs → lib/jobapi/src/custom_rc/entity.rs
diff --git a/...l_app/src/custom_rc/entity/file_entity.rs → ...obapi/src/custom_rc/entity/file_entity.rs b/...l_app/src/custom_rc/entity/file_entity.rs → ...obapi/src/custom_rc/entity/file_entity.rs
diff --git a/...c/custom_rc/entity/text_entity_factory.rs → ...c/custom_rc/entity/text_entity_factory.rs b/...c/custom_rc/entity/text_entity_factory.rs → ...c/custom_rc/entity/text_entity_factory.rs
diff --git a/...entity/text_entity_factory/dynamic_lru.rs → ...entity/text_entity_factory/dynamic_lru.rs b/...entity/text_entity_factory/dynamic_lru.rs → ...entity/text_entity_factory/dynamic_lru.rs
diff --git a/...stom_rc/entity/writable_entity_factory.rs → ...stom_rc/entity/writable_entity_factory.rs b/...stom_rc/entity/writable_entity_factory.rs → ...stom_rc/entity/writable_entity_factory.rs
diff --git a/...control_app/src/custom_rc/file_factory.rs → lib/jobapi/src/custom_rc/file_factory.rs b/...control_app/src/custom_rc/file_factory.rs → lib/jobapi/src/custom_rc/file_factory.rs
diff --git a/judge_control_app/src/custom_rc/file_link.rs → lib/jobapi/src/custom_rc/file_link.rs b/judge_control_app/src/custom_rc/file_link.rs → lib/jobapi/src/custom_rc/file_link.rs
diff --git a/...ontrol_app/src/custom_rc/readonly_file.rs → lib/jobapi/src/custom_rc/readonly_file.rs b/...ontrol_app/src/custom_rc/readonly_file.rs → lib/jobapi/src/custom_rc/readonly_file.rs
diff --git a/...ontrol_app/src/custom_rc/writable_file.rs → lib/jobapi/src/custom_rc/writable_file.rs b/...ontrol_app/src/custom_rc/writable_file.rs → lib/jobapi/src/custom_rc/writable_file.rs
diff --git a/judge_control_app/src/lib.rs → lib/jobapi/src/lib.rs b/judge_control_app/src/lib.rs → lib/jobapi/src/lib.rs
diff --git a/judge_control_app/src/models.rs → lib/jobapi/src/models.rs b/judge_control_app/src/models.rs → lib/jobapi/src/models.rs
diff --git a/judge_control_app/src/models/judge_recipe.rs → lib/jobapi/src/models/judge_recipe.rs b/judge_control_app/src/models/judge_recipe.rs → lib/jobapi/src/models/judge_recipe.rs
diff --git a/judge_control_app/src/models/judge_result.rs → lib/jobapi/src/models/judge_result.rs b/judge_control_app/src/models/judge_result.rs → lib/jobapi/src/models/judge_result.rs
diff --git a/judge_control_app/src/remote_exec.rs → lib/jobapi/src/remote_exec.rs b/judge_control_app/src/remote_exec.rs → lib/jobapi/src/remote_exec.rs
diff --git a/judge_control_app/src/spmc_oneshot.rs → lib/jobapi/src/spmc_oneshot.rs b/judge_control_app/src/spmc_oneshot.rs → lib/jobapi/src/spmc_oneshot.rs
diff --git a/...l_app/src/spmc_oneshot/sender_with_ord.rs → ...obapi/src/spmc_oneshot/sender_with_ord.rs b/...l_app/src/spmc_oneshot/sender_with_ord.rs → ...obapi/src/spmc_oneshot/sender_with_ord.rs
diff --git a/judge_control_app/src/submission_logic.rs → lib/jobapi/src/submission_logic.rs b/judge_control_app/src/submission_logic.rs → lib/jobapi/src/submission_logic.rs
diff --git a/...ol_app/src/submission_logic/extra_envs.rs → ...jobapi/src/submission_logic/extra_envs.rs b/...ol_app/src/submission_logic/extra_envs.rs → ...jobapi/src/submission_logic/extra_envs.rs
diff --git a/.../src/submission_logic/file_preparation.rs → .../src/submission_logic/file_preparation.rs b/.../src/submission_logic/file_preparation.rs → .../src/submission_logic/file_preparation.rs
diff --git a/...ol_app/src/submission_logic/heuristics.rs → ...jobapi/src/submission_logic/heuristics.rs b/...ol_app/src/submission_logic/heuristics.rs → ...jobapi/src/submission_logic/heuristics.rs
diff --git a/...c/submission_logic/heuristics/priority.rs → ...c/submission_logic/heuristics/priority.rs b/...c/submission_logic/heuristics/priority.rs → ...c/submission_logic/heuristics/priority.rs
diff --git a/...control_app/src/submission_logic/logic.rs → lib/jobapi/src/submission_logic/logic.rs b/...control_app/src/submission_logic/logic.rs → lib/jobapi/src/submission_logic/logic.rs
diff --git a/...ontrol_app/src/submission_logic/models.rs → lib/jobapi/src/submission_logic/models.rs b/...ontrol_app/src/submission_logic/models.rs → lib/jobapi/src/submission_logic/models.rs
diff --git a/...app/src/submission_logic/output_parser.rs → ...api/src/submission_logic/output_parser.rs b/...app/src/submission_logic/output_parser.rs → ...api/src/submission_logic/output_parser.rs
diff --git a/...ol_app/src/submission_logic/single_run.rs → ...jobapi/src/submission_logic/single_run.rs b/...ol_app/src/submission_logic/single_run.rs → ...jobapi/src/submission_logic/single_run.rs
diff --git a/...ntrol_app/src/text_resource_repository.rs → lib/jobapi/src/text_resource_repository.rs b/...ntrol_app/src/text_resource_repository.rs → lib/jobapi/src/text_resource_repository.rs
diff --git a/judge_core/Cargo.toml → lib/judge_core/Cargo.toml b/judge_core/Cargo.toml → lib/judge_core/Cargo.toml
diff --git a/judge_core/src/common.rs → lib/judge_core/src/common.rs b/judge_core/src/common.rs → lib/judge_core/src/common.rs
diff --git a/judge_core/src/job.rs → lib/judge_core/src/job.rs b/judge_core/src/job.rs → lib/judge_core/src/job.rs
diff --git a/judge_core/src/lib.rs → lib/judge_core/src/lib.rs b/judge_core/src/lib.rs → lib/judge_core/src/lib.rs
diff --git a/judge_core/src/procedure.rs → lib/judge_core/src/procedure.rs b/judge_core/src/procedure.rs → lib/judge_core/src/procedure.rs
diff --git a/judge_core/src/runner.rs → lib/judge_core/src/runner.rs b/judge_core/src/runner.rs → lib/judge_core/src/runner.rs
diff --git a/lib/local_jobapi/Cargo.toml b/lib/local_jobapi/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "local_jobapi"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
diff --git a/lib/local_jobapi/src/lib.rs b/lib/local_jobapi/src/lib.rs
@@ -0,0 +1 @@
+
diff --git a/traopy/.gitignore → pylib/traopy/.gitignore b/traopy/.gitignore → pylib/traopy/.gitignore
diff --git a/traopy/.python-version → pylib/traopy/.python-version b/traopy/.python-version → pylib/traopy/.python-version
diff --git a/traopy/Cargo.toml → pylib/traopy/Cargo.toml b/traopy/Cargo.toml → pylib/traopy/Cargo.toml
@@ -14,7 +14,7 @@ uuid = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 anyhow = { workspace = true }
-judge_core = { path = "../judge_core" }
+judge_core = { path = "../../lib/judge_core" }
 
 [features]
 abi3 = ["pyo3/abi3-py37", "generate-import-lib"]

diff --git a/traopy/README.md → pylib/traopy/README.md b/traopy/README.md → pylib/traopy/README.md
diff --git a/traopy/example/.gitignore → pylib/traopy/example/.gitignore b/traopy/example/.gitignore → pylib/traopy/example/.gitignore
diff --git a/traopy/example/.python-version → pylib/traopy/example/.python-version b/traopy/example/.python-version → pylib/traopy/example/.python-version
diff --git a/traopy/example/README.md → pylib/traopy/example/README.md b/traopy/example/README.md → pylib/traopy/example/README.md
diff --git a/traopy/example/problems/addition/.gitignore → ...aopy/example/problems/addition/.gitignore b/traopy/example/problems/addition/.gitignore → ...aopy/example/problems/addition/.gitignore
diff --git a/...lems/addition/judge_procedure_sample.json → ...lems/addition/judge_procedure_sample.json b/...lems/addition/judge_procedure_sample.json → ...lems/addition/judge_procedure_sample.json
diff --git a/traopy/example/problems/addition/main.ipynb → ...aopy/example/problems/addition/main.ipynb b/traopy/example/problems/addition/main.ipynb → ...aopy/example/problems/addition/main.ipynb
diff --git a/...ple/problems/addition/testcases/input.txt → ...ple/problems/addition/testcases/input.txt b/...ple/problems/addition/testcases/input.txt → ...ple/problems/addition/testcases/input.txt
diff --git a/...le/problems/addition/testcases/output.txt → ...le/problems/addition/testcases/output.txt b/...le/problems/addition/testcases/output.txt → ...le/problems/addition/testcases/output.txt
diff --git a/traopy/example/problems/addition/tester.py → ...raopy/example/problems/addition/tester.py b/traopy/example/problems/addition/tester.py → ...raopy/example/problems/addition/tester.py
diff --git a/traopy/example/pyproject.toml → pylib/traopy/example/pyproject.toml b/traopy/example/pyproject.toml → pylib/traopy/example/pyproject.toml
diff --git a/traopy/pyproject.toml → pylib/traopy/pyproject.toml b/traopy/pyproject.toml → pylib/traopy/pyproject.toml
diff --git a/traopy/python/traopy/__init__.py → pylib/traopy/python/traopy/__init__.py b/traopy/python/traopy/__init__.py → pylib/traopy/python/traopy/__init__.py
diff --git a/traopy/python/traopy/lowlevel.pyi → pylib/traopy/python/traopy/lowlevel.pyi b/traopy/python/traopy/lowlevel.pyi → pylib/traopy/python/traopy/lowlevel.pyi
diff --git a/traopy/python/traopy/py.typed → pylib/traopy/python/traopy/py.typed b/traopy/python/traopy/py.typed → pylib/traopy/python/traopy/py.typed
diff --git a/traopy/requirements-dev.lock → pylib/traopy/requirements-dev.lock b/traopy/requirements-dev.lock → pylib/traopy/requirements-dev.lock
diff --git a/traopy/requirements.lock → pylib/traopy/requirements.lock b/traopy/requirements.lock → pylib/traopy/requirements.lock
diff --git a/traopy/src/bin/gen_stub.rs → pylib/traopy/src/bin/gen_stub.rs b/traopy/src/bin/gen_stub.rs → pylib/traopy/src/bin/gen_stub.rs
diff --git a/traopy/src/environment.rs → pylib/traopy/src/environment.rs b/traopy/src/environment.rs → pylib/traopy/src/environment.rs
diff --git a/traopy/src/lib.rs → pylib/traopy/src/lib.rs b/traopy/src/lib.rs → pylib/traopy/src/lib.rs
diff --git a/traopy/src/models.rs → pylib/traopy/src/models.rs b/traopy/src/models.rs → pylib/traopy/src/models.rs
diff --git a/traopy/src/models/dependency.rs → pylib/traopy/src/models/dependency.rs b/traopy/src/models/dependency.rs → pylib/traopy/src/models/dependency.rs
diff --git a/traopy/src/models/empty_directory.rs → pylib/traopy/src/models/empty_directory.rs b/traopy/src/models/empty_directory.rs → pylib/traopy/src/models/empty_directory.rs
diff --git a/traopy/src/models/execution.rs → pylib/traopy/src/models/execution.rs b/traopy/src/models/execution.rs → pylib/traopy/src/models/execution.rs
diff --git a/traopy/src/models/output.rs → pylib/traopy/src/models/output.rs b/traopy/src/models/output.rs → pylib/traopy/src/models/output.rs
diff --git a/traopy/src/models/resource_kind.rs → pylib/traopy/src/models/resource_kind.rs b/traopy/src/models/resource_kind.rs → pylib/traopy/src/models/resource_kind.rs
diff --git a/traopy/src/models/runtime_text.rs → pylib/traopy/src/models/runtime_text.rs b/traopy/src/models/runtime_text.rs → pylib/traopy/src/models/runtime_text.rs
diff --git a/traopy/src/models/script.rs → pylib/traopy/src/models/script.rs b/traopy/src/models/script.rs → pylib/traopy/src/models/script.rs
diff --git a/traopy/src/models/text.rs → pylib/traopy/src/models/text.rs b/traopy/src/models/text.rs → pylib/traopy/src/models/text.rs
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ managed = true
 dev-dependencies = []
 
 [tool.rye.workspace]
-members = ["traopy/example", "traopy"]
+members = ["pylib/traopy/example", "pylib/traopy"]
 
 [tool.setuptools.packages.find]
-include = ["traopy"]
+include = ["pylib"]
diff --git a/requirements-dev.lock b/requirements-dev.lock
@@ -10,8 +10,8 @@
 #   universal: false
 
 -e file:.
--e file:traopy
--e file:traopy/example
+-e file:pylib/traopy
+-e file:pylib/traopy/example
 asttokens==3.0.0
     # via stack-data
 comm==0.2.2

diff --git a/requirements.lock b/requirements.lock
@@ -10,8 +10,8 @@
 #   universal: false
 
 -e file:.
--e file:traopy
--e file:traopy/example
+-e file:pylib/traopy
+-e file:pylib/traopy/example
 asttokens==3.0.0
     # via stack-data
 comm==0.2.2

diff --git a/traojudge_judge_workspace.egg-info/PKG-INFO b/traojudge_judge_workspace.egg-info/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 2.2
+Name: traojudge-judge-workspace
+Version: 0.1.0
+Summary: Rye workspace for traO-Judge-judge repository
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# traO-Judge-judge
+traO Judge ジャッジ
diff --git a/traojudge_judge_workspace.egg-info/SOURCES.txt b/traojudge_judge_workspace.egg-info/SOURCES.txt
@@ -0,0 +1,7 @@
+LICENSE
+README.md
+pyproject.toml
+traojudge_judge_workspace.egg-info/PKG-INFO
+traojudge_judge_workspace.egg-info/SOURCES.txt
+traojudge_judge_workspace.egg-info/dependency_links.txt
+traojudge_judge_workspace.egg-info/top_level.txt
diff --git a/traojudge_judge_workspace.egg-info/dependency_links.txt b/traojudge_judge_workspace.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/traojudge_judge_workspace.egg-info/top_level.txt b/traojudge_judge_workspace.egg-info/top_level.txt
@@ -0,0 +1 @@
+pylib
diff --git a/writerutil/Cargo.toml b/writerutil/Cargo.toml