Fix bindings

Heliozoa · Heliozoa · commit 72a7d60e2a48 · 2023-08-21T09:35:22.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,10 +39,10 @@ tmc-langs-util = { path = "crates/tmc-langs-util" }
 tmc-mooc-client = { path = "crates/tmc-mooc-client" }
 tmc-server-mock = { path = "crates/helpers/tmc-server-mock" }
 tmc-testmycode-client = { path = "crates/tmc-testmycode-client" }
-ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "043c49c461543367d702e4db503f793f1ba801c2" }
+ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "07712bf04007472aeeb065091261b3b64c019381" }
 
 # [patch.'https://github.com/Heliozoa/ts-rs.git']
 # ts-rs = { path = "../ts-rs/ts-rs" }
 
-# [patch.'https://github.com/rage/secret-project-331.git']
-# mooc-langs-api = { path = "../secret-project-331/services/headless-lms/langs-api" }
+[patch.'https://github.com/rage/secret-project-331.git']
+mooc-langs-api = { path = "../secret-project-331/services/headless-lms/langs-api" }
diff --git a/crates/bindings/tmc-langs-node/Cargo.toml b/crates/bindings/tmc-langs-node/Cargo.toml
@@ -31,6 +31,3 @@ log = "0.4.14"
 once_cell = "1.9.0"
 simple_logger = "4.0.0"
 tmc-server-mock.workspace = true
-
-[features]
-ts-rs = ["tmc-langs/ts-rs"]
diff --git a/crates/bindings/tmc-langs-node/src/bin/generate-node-bindings.rs b/crates/bindings/tmc-langs-node/src/bin/generate-node-bindings.rs
@@ -3,7 +3,9 @@
 use std::fs::File;
 
 fn main() {
-    let mut file = File::create(concat!(env!("CARGO_MANIFEST_DIR"), "/ts/generated.d.ts")).unwrap();
+    println!("Generating node bindings");
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/ts/generated.d.ts");
+    let mut file = File::create(path).unwrap();
     ts_rs::export_to! {
         &mut file,
         // checkstyle
@@ -71,5 +73,6 @@ fn main() {
         // listSettings
         tmc_langs::TmcConfig,
     }
-    .unwrap()
+    .unwrap();
+    println!("Wrote bindings to `{path}`");
 }
diff --git a/crates/bindings/tmc-langs-node/src/lib.rs b/crates/bindings/tmc-langs-node/src/lib.rs
@@ -38,7 +38,7 @@ fn make_testmycode_client(
     client_name: impl AsRef<str>,
     client_version: impl AsRef<str>,
 ) -> Result<(TestMyCodeClient, Option<Credentials>), LangsError> {
-    let root_url = env::var("TMC_LANGS_ROOT_URL")
+    let root_url = env::var("TMC_LANGS_TMC_ROOT_URL")
         .unwrap_or_else(|_| "https://tmc.mooc.fi/".to_string())
         .parse()
         .expect("Invalid TMC root url");
diff --git a/crates/bindings/tmc-langs-node/ts/generated.d.ts b/crates/bindings/tmc-langs-node/ts/generated.d.ts
@@ -14,7 +14,7 @@ export interface RefreshData { "new-cache-path": string, "course-options": objec
 
 export interface RefreshExercise { name: string, checksum: string, points: Array<string>, "sandbox-image": string, "tmcproject-yml": TmcProjectYml | null, }
 
-export interface TmcProjectYml { extra_student_files: Array<string>, extra_exercise_files: Array<string>, force_update: Array<string>, tests_timeout_ms?: bigint, fail_on_valgrind_error?: boolean, minimum_python_version?: PythonVer, sandbox_image?: string, }
+export interface TmcProjectYml { extra_student_files: Array<string>, extra_exercise_files: Array<string>, force_update: Array<string>, tests_timeout_ms?: number, fail_on_valgrind_error?: boolean, minimum_python_version?: PythonVer, sandbox_image?: string, }
 
 export interface PythonVer { major: number, minor: number | null, patch: number | null, }
 
diff --git a/crates/bindings/tmc-langs-node/ts/tmc.ts b/crates/bindings/tmc-langs-node/ts/tmc.ts
@@ -21,7 +21,7 @@ export class Tmc {
     this.clientVersion = clientVersion;
     if (rootUrl) {
       this.rootUrl = rootUrl;
-      tmc.setEnv("TMC_LANGS_ROOT_URL", rootUrl);
+      tmc.setEnv("TMC_LANGS_TMC_ROOT_URL", rootUrl);
     }
     if (configDir) {
       this.configDir = configDir;
@@ -49,9 +49,15 @@ export class Tmc {
     outputPath: string,
     compression: Compression,
     deterministic: boolean,
-    naive: boolean,
+    naive: boolean
   ): void {
-    return tmc.compressProject(exercisePath, outputPath, compression, deterministic, naive);
+    return tmc.compressProject(
+      exercisePath,
+      outputPath,
+      compression,
+      deterministic,
+      naive
+    );
   }
 
   extractProject(
diff --git a/crates/tmc-langs-cli/README.md b/crates/tmc-langs-cli/README.md
@@ -3,6 +3,7 @@ CLI interface for tmc-langs. The documentation for the various commands and para
 ## Running the CLI
 
 Running the project with Cargo from the repository root:
+
 ```bash
 cargo run -p tmc-langs-cli help
 ```
@@ -21,7 +22,7 @@ Binaries for the supported targets are built and the binaries deployed to Google
 
 | var name                         | usage                                                          |
 | -------------------------------- | -------------------------------------------------------------- |
-| `TMC_LANGS_ROOT_URL`             | Sets the TMC server url.                                       |
+| `TMC_LANGS_TMC_ROOT_URL`         | Sets the TMC server url.                                       |
 | `TMC_LANGS_CONFIG_DIR`           | Sets the config directory.                                     |
 | `TMC_LANGS_DEFAULT_PROJECTS_DIR` | Sets the default projects directory.                           |
 | `TMC_SANDBOX`                    | If set, the CLI considers itself to be running in tmc-sandbox. |
diff --git a/crates/tmc-langs-cli/bindings.d.ts b/crates/tmc-langs-cli/bindings.d.ts
@@ -20,7 +20,7 @@ export interface StatusUpdate<T> { finished: boolean, message: string, "percent-
 
 export type NotificationKind = "warning" | "info";
 
-export type DataKind = { "output-data-kind": "error", "output-data": { kind: Kind, trace: Array<string>, } } | { "output-data-kind": "validation", "output-data": StyleValidationResult } | { "output-data-kind": "available-points", "output-data": Array<string> } | { "output-data-kind": "exercises", "output-data": Array<string> } | { "output-data-kind": "exercise-packaging-configuration", "output-data": ExercisePackagingConfiguration } | { "output-data-kind": "local-exercises", "output-data": Array<LocalExercise> } | { "output-data-kind": "refresh-result", "output-data": RefreshData } | { "output-data-kind": "test-result", "output-data": RunResult } | { "output-data-kind": "exercise-desc", "output-data": ExerciseDesc } | { "output-data-kind": "updated-exercises", "output-data": Array<UpdatedExercise> } | { "output-data-kind": "exercise-download", "output-data": DownloadOrUpdateCourseExercisesResult } | { "output-data-kind": "combined-course-data", "output-data": CombinedCourseData } | { "output-data-kind": "course-details", "output-data": CourseDetails } | { "output-data-kind": "course-exercises", "output-data": Array<CourseExercise> } | { "output-data-kind": "course-data", "output-data": CourseData } | { "output-data-kind": "courses", "output-data": Array<Course> } | { "output-data-kind": "exercise-details", "output-data": ExerciseDetails } | { "output-data-kind": "submissions", "output-data": Array<Submission> } | { "output-data-kind": "update-result", "output-data": UpdateResult } | { "output-data-kind": "organization", "output-data": Organization } | { "output-data-kind": "organizations", "output-data": Array<Organization> } | { "output-data-kind": "reviews", "output-data": Array<Review> } | { "output-data-kind": "token", "output-data": unknown } | { "output-data-kind": "new-submission", "output-data": NewSubmission } | { "output-data-kind": "submission-feedback-response", "output-data": SubmissionFeedbackResponse } | { "output-data-kind": "submission-finished", "output-data": SubmissionFinished } | { "output-data-kind": "config-value", "output-data": ConfigValue } | { "output-data-kind": "tmc-config", "output-data": TmcConfig } | { "output-data-kind": "compressed-project-hash", "output-data": string } | { "output-data-kind": "submission-sandbox", "output-data": string };
+export type DataKind = { "output-data-kind": "error", "output-data": { kind: Kind, trace: Array<string>, } } | { "output-data-kind": "validation", "output-data": StyleValidationResult } | { "output-data-kind": "available-points", "output-data": Array<string> } | { "output-data-kind": "exercises", "output-data": Array<string> } | { "output-data-kind": "exercise-packaging-configuration", "output-data": ExercisePackagingConfiguration } | { "output-data-kind": "local-exercises", "output-data": Array<LocalExercise> } | { "output-data-kind": "refresh-result", "output-data": RefreshData } | { "output-data-kind": "test-result", "output-data": RunResult } | { "output-data-kind": "exercise-desc", "output-data": ExerciseDesc } | { "output-data-kind": "updated-exercises", "output-data": Array<UpdatedExercise> } | { "output-data-kind": "exercise-download", "output-data": DownloadOrUpdateCourseExercisesResult } | { "output-data-kind": "combined-course-data", "output-data": CombinedCourseData } | { "output-data-kind": "course-details", "output-data": CourseDetails } | { "output-data-kind": "course-exercises", "output-data": Array<CourseExercise> } | { "output-data-kind": "course-data", "output-data": CourseData } | { "output-data-kind": "courses", "output-data": Array<Course> } | { "output-data-kind": "exercise-details", "output-data": ExerciseDetails } | { "output-data-kind": "submissions", "output-data": Array<Submission> } | { "output-data-kind": "update-result", "output-data": UpdateResult } | { "output-data-kind": "organization", "output-data": Organization } | { "output-data-kind": "organizations", "output-data": Array<Organization> } | { "output-data-kind": "reviews", "output-data": Array<Review> } | { "output-data-kind": "token", "output-data": unknown } | { "output-data-kind": "new-submission", "output-data": NewSubmission } | { "output-data-kind": "submission-feedback-response", "output-data": SubmissionFeedbackResponse } | { "output-data-kind": "submission-finished", "output-data": SubmissionFinished } | { "output-data-kind": "config-value", "output-data": ConfigValue } | { "output-data-kind": "tmc-config", "output-data": TmcConfig } | { "output-data-kind": "compressed-project-hash", "output-data": string } | { "output-data-kind": "submission-sandbox", "output-data": string } | { "output-data-kind": "mooc-course-instances", "output-data": Array<CourseInstance> } | { "output-data-kind": "mooc-exercise-slides", "output-data": Array<TmcExerciseSlide> } | { "output-data-kind": "mooc-exercise-slide", "output-data": TmcExerciseSlide } | { "output-data-kind": "mooc-submission-finished", "output-data": ExerciseTaskSubmissionResult };
 
 export interface NewSubmission { show_submission_url: string, paste_url: string, submission_url: string, }
 
@@ -102,3 +102,17 @@ export interface TestCase { name: string, successful: boolean, message: string |
 
 export type SubmissionFeedbackKind = "Text" | { "IntRange": { lower: number, upper: number, } };
 
+export interface CourseInstance { id: string, course_id: string, course_slug: string, course_name: string, course_description: string | null, instance_name: string | null, instance_description: string | null, }
+
+export interface TmcExerciseSlide { slide_id: string, exercise_id: string, exercise_name: string, exercise_order_number: number, deadline: Date | null, tasks: Array<TmcExerciseTask>, }
+
+export interface TmcExerciseTask { task_id: string, order_number: number, assignment: unknown, public_spec: PublicSpec | null, model_solution_spec: ModelSolutionSpec | null, }
+
+export type PublicSpec = { "type": "browser", files: Array<ExerciseFile>, } | { "type": "editor", archiveName: string, archiveDownloadUrl: string, checksum: string, };
+
+export type ModelSolutionSpec = { "type": "browser", solutionFiles: Array<ExerciseFile>, } | { "type": "editor", archiveDownloadUrl: string, };
+
+export interface ExerciseFile { filepath: string, contents: string, }
+
+export interface ExerciseTaskSubmissionResult { submission_id: string, }
+
diff --git a/crates/tmc-langs-cli/src/app.rs b/crates/tmc-langs-cli/src/app.rs
@@ -560,6 +560,10 @@ pub enum MoocCommand {
         #[clap(long)]
         exercise_id: Uuid,
         #[clap(long)]
+        slide_id: Uuid,
+        #[clap(long)]
+        task_id: Uuid,
+        #[clap(long)]
         submission_path: PathBuf,
     },
 }
@@ -1222,6 +1226,13 @@ fn generate_cli_bindings() {
         tmc::response::SubmissionFeedbackQuestion,
         tmc::response::TestCase,
         tmc::response::SubmissionFeedbackKind,
+        mooc::CourseInstance,
+        mooc::TmcExerciseSlide,
+        mooc::TmcExerciseTask,
+        mooc::PublicSpec,
+        mooc::ModelSolutionSpec,
+        mooc::ExerciseFile,
+        mooc::ExerciseTaskSubmissionResult,
     )
     .unwrap();
 }
diff --git a/crates/tmc-langs-cli/src/lib.rs b/crates/tmc-langs-cli/src/lib.rs
@@ -933,7 +933,7 @@ fn run_tmc_inner(
 
             if dont_block {
                 CliOutput::finished_with_data(
-                    "submit exercise",
+                    "submitted exercise",
                     DataKind::NewSubmission(new_submission),
                 )
             } else {
@@ -943,7 +943,7 @@ fn run_tmc_inner(
                     .wait_for_submission_at(submission_url)
                     .context("Failed while waiting for submissions")?;
                 CliOutput::finished_with_data(
-                    "submit exercise",
+                    "submitted exercise",
                     DataKind::SubmissionFinished(submission_finished),
                 )
             }
@@ -1036,8 +1036,27 @@ fn run_mooc_inner(mooc: Mooc, client: &mut MoocClient) -> Result<CliOutput> {
             )?;
             CliOutput::finished("downloaded exercise")
         }
-        MoocCommand::Submit { .. } => {
-            todo!()
+        MoocCommand::Submit {
+            exercise_id,
+            slide_id,
+            task_id,
+            submission_path,
+        } => {
+            file_util::lock!(submission_path);
+            let temp = file_util::named_temp_file()?;
+            tmc_langs::compress_project_to(
+                &submission_path,
+                temp.path(),
+                Compression::TarZstd,
+                false,
+                false,
+            )?;
+
+            let result = client.submit(exercise_id, slide_id, task_id, temp.path())?;
+            CliOutput::finished_with_data(
+                "submitted exercise",
+                DataKind::MoocSubmissionFinished(result),
+            )
         }
     };
     Ok(output)
diff --git a/crates/tmc-langs-cli/src/output.rs b/crates/tmc-langs-cli/src/output.rs
@@ -105,12 +105,10 @@ pub enum DataKind {
     TmcConfig(TmcConfig),
     CompressedProjectHash(String),
     SubmissionSandbox(String),
-    #[cfg_attr(feature = "ts-rs", ts(skip))]
     MoocCourseInstances(Vec<mooc::CourseInstance>),
-    #[cfg_attr(feature = "ts-rs", ts(skip))]
     MoocExerciseSlides(Vec<mooc::TmcExerciseSlide>),
-    #[cfg_attr(feature = "ts-rs", ts(skip))]
     MoocExerciseSlide(mooc::TmcExerciseSlide),
+    MoocSubmissionFinished(mooc::ExerciseTaskSubmissionResult),
 }
 
 #[derive(Debug, Serialize, Deserialize)]
diff --git a/crates/tmc-langs/Cargo.toml b/crates/tmc-langs/Cargo.toml
@@ -60,4 +60,5 @@ ts-rs = [
   "tmc-testmycode-client/ts-rs",
   "tmc-langs-framework/ts-rs",
   "tmc-langs-util/ts-rs",
+  "tmc-mooc-client/ts-rs",
 ]
diff --git a/crates/tmc-mooc-client/Cargo.toml b/crates/tmc-mooc-client/Cargo.toml
@@ -24,7 +24,11 @@ reqwest = { version = "0.11.18", default-features = false, features = [
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 thiserror = "1.0.40"
+ts-rs = { workspace = true, features = ["serde-compat"], optional = true }
 uuid = { version = "1.3.3", features = ["serde", "v4"] }
 
 [dev-dependencies]
 simple_logger = "4.0.0"
+
+[features]
+ts-rs = ["dep:ts-rs", "mooc-langs-api/ts_rs"]
diff --git a/crates/tmc-mooc-client/src/exercise.rs b/crates/tmc-mooc-client/src/exercise.rs
@@ -2,9 +2,12 @@ use chrono::{DateTime, Utc};
 use mooc_langs_api as api;
 use serde::{Deserialize, Serialize};
 use tmc_langs_util::{deserialize, JsonError};
+#[cfg(feature = "ts-rs")]
+use ts_rs::TS;
 use uuid::Uuid;
 
 #[derive(Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "ts-rs", derive(TS))]
 pub struct TmcExerciseSlide {
     pub slide_id: Uuid,
     pub exercise_id: Uuid,
@@ -34,6 +37,7 @@ impl TryFrom<api::ExerciseSlide> for TmcExerciseSlide {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "ts-rs", derive(TS))]
 pub struct TmcExerciseTask {
     pub task_id: Uuid,
     pub order_number: i32,
@@ -65,6 +69,7 @@ impl TryFrom<api::ExerciseTask> for TmcExerciseTask {
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "type")]
 #[serde(rename_all = "camelCase")]
+#[cfg_attr(feature = "ts-rs", derive(TS))]
 pub enum PublicSpec {
     Browser {
         files: Vec<ExerciseFile>,
@@ -94,6 +99,7 @@ pub enum UserAnswer {
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "type")]
 #[serde(rename_all = "camelCase")]
+#[cfg_attr(feature = "ts-rs", derive(TS))]
 pub enum ModelSolutionSpec {
     Browser {
         #[serde(rename = "solutionFiles")]
@@ -106,6 +112,7 @@ pub enum ModelSolutionSpec {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "ts-rs", derive(TS))]
 pub struct ExerciseFile {
     filepath: String,
     contents: String,
diff --git a/scripts/generate-cli-ts-bindings.bash b/scripts/generate-cli-ts-bindings.bash
diff --git a/scripts/generate-node-ts-bindings.bash b/scripts/generate-node-ts-bindings.bash
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cargo run --bin generate-node-bindings
