Merge pull request #112 from traP-jp/fix/#111-rename-onetime-to-runtime

🚚 onetime -> runtime

judge_core/src/job.rs

@@ -51,7 +51,7 @@ pub enum ExecutionJobError {
 pub enum FilePlacementJob {
     PlaceEmptyDirectory,
     /// Content of the text file
-    PlaceOnetimeTextFile(String),
+    PlaceRuntimeTextFile(String),
     /// Global project-wide unique identifier
     PlaceTextFile(Uuid),
 }

judge_core/src/procedure.rs

@@ -2,13 +2,13 @@ use uuid::Uuid;
 
 /// All runtime_id must be unique application-wide for each submission.
 pub struct Procedure {
-    pub onetime_texts: Vec<OnetimeText>,
+    pub runtime_texts: Vec<RuntimeText>,
     pub texts: Vec<Text>,
     pub empty_directories: Vec<EmptyDirectory>,
     pub executions: Vec<Execution>,
 }
 
-pub struct OnetimeText {
+pub struct RuntimeText {
     pub content: String,
     pub runtime_id: Uuid,
 }

judge_core/src/runner.rs

@@ -40,7 +40,7 @@ impl<JobOutcomeType: Clone, JobApiType: JobApi<JobOutcomeType>> Runner<JobOutcom
     ) -> Result<HashMap<Uuid, ExecutionJobOutput>, RunnerRunError> {
         // Create list of all ids
         let mut file_placement_ids = Vec::new();
-        file_placement_ids.extend(procedure.onetime_texts.iter().map(|x| x.runtime_id));
+        file_placement_ids.extend(procedure.runtime_texts.iter().map(|x| x.runtime_id));
         file_placement_ids.extend(procedure.texts.iter().map(|x| x.runtime_id));
         file_placement_ids.extend(procedure.empty_directories.iter().map(|x| x.runtime_id));
         let execution_ids = procedure
@@ -101,9 +101,9 @@ impl<JobOutcomeType: Clone, JobApiType: JobApi<JobOutcomeType>> Runner<JobOutcom
         // Create file placement jobs
         let mut file_placement_jobs = HashMap::new();
         {
-            for onetime_text in procedure.onetime_texts.iter() {
-                let job = FilePlacementJob::PlaceOnetimeTextFile(onetime_text.content.clone());
-                file_placement_jobs.insert(onetime_text.runtime_id, job);
+            for runtime_text in procedure.runtime_texts.iter() {
+                let job = FilePlacementJob::PlaceRuntimeTextFile(runtime_text.content.clone());
+                file_placement_jobs.insert(runtime_text.runtime_id, job);
             }
             for text in procedure.texts.iter() {
                 let job = FilePlacementJob::PlaceTextFile(text.resource_id);

traopy/example/problems/addition/judge_procedure_sample.json

@@ -1,7 +1,7 @@
 {
   "resources": {
     "output": { "TextFile": { "name": "output", "content": "3\n" } },
-    "actual": { "OnetimeTextFile": { "name": "actual" } },
+    "actual": { "RuntimeTextFile": { "name": "actual" } },
     "input": { "TextFile": { "name": "input", "content": "1 2\n" } }
   },
   "executions": {

traopy/example/problems/addition/main.ipynb

@@ -13,7 +13,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -23,7 +23,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -32,7 +32,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -56,12 +56,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
-    "actual_output = traopy.PyResourceKind.OnetimeTextFile(\n",
-    "    traopy.PyOnetimeText(\n",
+    "actual_output = traopy.PyResourceKind.RuntimeTextFile(\n",
+    "    traopy.PyRuntimeText(\n",
     "        \"actual\",\n",
     "    )\n",
     ")\n",
@@ -71,7 +71,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -85,7 +85,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -113,7 +113,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [

traopy/python/traopy/lowlevel.pyi

@@ -34,11 +34,11 @@ class PyExecution:
     def __new__(cls,name:builtins.str, script:PyScriptOutput, depends_on:typing.Sequence[PyDependency]): ...
     ...
 
-class PyOnetimeText:
-    def __new__(cls,name:builtins.str): ...
+class PyOutput:
     ...
 
-class PyOutput:
+class PyRuntimeText:
+    def __new__(cls,name:builtins.str): ...
     ...
 
 class PyScript:
@@ -54,6 +54,6 @@ class PyText:
 
 class PyResourceKind(Enum):
     EmptyDirectory = auto()
-    OnetimeTextFile = auto()
+    RuntimeTextFile = auto()
     TextFile = auto()
 

traopy/src/lib.rs

@@ -9,7 +9,7 @@ fn lowlevel(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<models::dependency::PyDependency>()?;
     m.add_class::<models::empty_directory::PyEmptyDirectory>()?;
     m.add_class::<models::execution::PyExecution>()?;
-    m.add_class::<models::onetime_text::PyOnetimeText>()?;
+    m.add_class::<models::runtime_text::PyRuntimeText>()?;
     m.add_class::<models::output::PyOutput>()?;
     m.add_class::<models::output::PyScriptOutput>()?;
     m.add_class::<models::resource_kind::PyResourceKind>()?;

traopy/src/models.rs

@@ -1,8 +1,8 @@
 pub mod dependency;
 pub mod empty_directory;
 pub mod execution;
-pub mod onetime_text;
 pub mod output;
 pub mod resource_kind;
+pub mod runtime_text;
 pub mod script;
 pub mod text;

traopy/src/models/resource_kind.rs

@@ -1,4 +1,4 @@
-use super::{empty_directory::*, onetime_text::*, text::*};
+use super::{empty_directory::*, runtime_text::*, text::*};
 use pyo3::prelude::*;
 use pyo3_stub_gen::derive::*;
 use serde::{Deserialize, Serialize};
@@ -8,22 +8,22 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone)]
 pub enum PyResourceKind {
     EmptyDirectory(PyEmptyDirectory),
-    OnetimeTextFile(PyOnetimeText),
+    RuntimeTextFile(PyRuntimeText),
     TextFile(PyText),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum SchemaResourceKind {
     EmptyDirectory(SchemaEmptyDirectory),
-    OnetimeTextFile(SchemaOnetimeText),
+    RuntimeTextFile(SchemaRuntimeText),
     TextFile(SchemaText),
 }
 
 impl SchemaResourceKind {
     pub fn name(&self) -> String {
         match self {
             SchemaResourceKind::EmptyDirectory(empty_directory) => empty_directory.name.clone(),
-            SchemaResourceKind::OnetimeTextFile(onetime_text) => onetime_text.name.clone(),
+            SchemaResourceKind::RuntimeTextFile(runtime_text) => runtime_text.name.clone(),
             SchemaResourceKind::TextFile(text) => text.name.clone(),
         }
     }
@@ -35,8 +35,8 @@ impl From<PyResourceKind> for SchemaResourceKind {
             PyResourceKind::EmptyDirectory(py_empty_directory) => {
                 SchemaResourceKind::EmptyDirectory(py_empty_directory.into())
             }
-            PyResourceKind::OnetimeTextFile(py_onetime_text) => {
-                SchemaResourceKind::OnetimeTextFile(py_onetime_text.into())
+            PyResourceKind::RuntimeTextFile(py_runtime_text) => {
+                SchemaResourceKind::RuntimeTextFile(py_runtime_text.into())
             }
             PyResourceKind::TextFile(py_text) => SchemaResourceKind::TextFile(py_text.into()),
         }

traopy/src/models/onetime_text.rs → traopy/src/models/runtime_text.rs

@@ -5,28 +5,28 @@ use serde::{Deserialize, Serialize};
 #[gen_stub_pyclass]
 #[pyclass]
 #[derive(Debug, Clone)]
-pub struct PyOnetimeText {
+pub struct PyRuntimeText {
     pub name: String,
 }
 
 #[gen_stub_pymethods]
 #[pymethods]
-impl PyOnetimeText {
+impl PyRuntimeText {
     #[new]
     pub fn new(name: String) -> Self {
-        PyOnetimeText { name }
+        PyRuntimeText { name }
     }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SchemaOnetimeText {
+pub struct SchemaRuntimeText {
     pub name: String,
 }
 
-impl From<PyOnetimeText> for SchemaOnetimeText {
-    fn from(py_onetime_text: PyOnetimeText) -> Self {
-        SchemaOnetimeText {
-            name: py_onetime_text.name,
+impl From<PyRuntimeText> for SchemaRuntimeText {
+    fn from(py_runtime_text: PyRuntimeText) -> Self {
+        SchemaRuntimeText {
+            name: py_runtime_text.name,
         }
     }
 }