feat: adding features to dock models and re-naming

models/csharp/DockModels.cs

@@ -1,36 +1,62 @@
 using System;
 [Serializable]
-public struct BucketModel
+public struct BucketRequest
 {
     public string Token;
     public string Password;
 
-    public BucketModel(string token, string password)
+    public BucketRequest(string token, string password)
     {
         Token = token;
         Password = password;
     }
 }
 
 [Serializable]
-public struct DownloadModel
+public struct DownloadRequest
 {
     public string Password;
 
-    public DownloadModel(string password)
+    public DownloadRequest(string password)
     {
         Password = password;
     }
 }
 
+[Serializable]
+public struct DownloadResponse
+{
+    public string Type;
+    public string Data;
+
+    public DownloadResponse(string type, string data)
+    {
+        Type = type;
+        Data = data;
+    }
+}
+
 [Serializable]
 public struct LoadModel
+{
+    public int[] Types;
+    public string[] Data;
+
+    public LoadModel(int[] types, string[] data)
+    {
+        Types = types;
+        Data = data;
+    }
+}
+
+[Serializable]
+public struct LoadRequest
 {
     public string Filename;
     public string Bucket;
     public string Password;
 
-    public LoadModel(string filename, string bucket, string password)
+    public LoadRequest(string filename, string bucket, string password)
     {
         Filename = filename;
         Bucket = bucket;
@@ -39,13 +65,13 @@ public LoadModel(string filename, string bucket, string password)
 }
 
 [Serializable]
-public struct SaveModel
+public struct SaveRequest
 {
     public string Filename;
     public string Bucket;
     public string Password;
 
-    public SaveModel(string filename, string bucket, string password)
+    public SaveRequest(string filename, string bucket, string password)
     {
         Filename = filename;
         Bucket = bucket;
@@ -54,13 +80,15 @@ public SaveModel(string filename, string bucket, string password)
 }
 
 [Serializable]
-public struct UploadModel
+public struct UploadRequest
 {
+    public int Type;
     public string Data;
     public string Password;
 
-    public UploadModel(string data, string password)
+    public UploadRequest(int type, string data, string password)
     {
+        Type = type;
         Data = data;
         Password = password;
     }

models/schemas/dock/BucketModel.json → models/schemas/dock/BucketRequest.json

@@ -1 +1 @@
-{"properties": {"Token": {"title": "Token", "type": "string"}, "Password": {"title": "Password", "type": "string"}}, "required": ["Token", "Password"], "title": "BucketModel", "type": "object"}
+{"properties": {"Token": {"title": "Token", "type": "string"}, "Password": {"title": "Password", "type": "string"}}, "required": ["Token", "Password"], "title": "BucketRequest", "type": "object"}

models/schemas/dock/DownloadRequest.json

@@ -0,0 +1 @@
+{"properties": {"Password": {"title": "Password", "type": "string"}}, "required": ["Password"], "title": "DownloadRequest", "type": "object"}

models/schemas/dock/DownloadResponse.json

@@ -0,0 +1 @@
+{"properties": {"Type": {"title": "Type", "type": "string"}, "Data": {"title": "Data", "type": "string"}}, "required": ["Type", "Data"], "title": "DownloadResponse", "type": "object"}

models/schemas/dock/LoadModel.json

@@ -1 +1 @@
-{"properties": {"Filename": {"default": "", "title": "Filename", "type": "string"}, "Bucket": {"default": "", "title": "Bucket", "type": "string"}, "Password": {"default": "", "title": "Password", "type": "string"}}, "title": "LoadModel", "type": "object"}
+{"properties": {"Types": {"items": {"type": "integer"}, "title": "Types", "type": "array"}, "Data": {"items": {"type": "string"}, "title": "Data", "type": "array"}}, "required": ["Types", "Data"], "title": "LoadModel", "type": "object"}

models/schemas/dock/SaveModel.json → models/schemas/dock/LoadRequest.json

@@ -1 +1 @@
-{"properties": {"Filename": {"default": "", "title": "Filename", "type": "string"}, "Bucket": {"default": "", "title": "Bucket", "type": "string"}, "Password": {"default": "", "title": "Password", "type": "string"}}, "title": "SaveModel", "type": "object"}
+{"properties": {"Filename": {"default": "", "title": "Filename", "type": "string"}, "Bucket": {"default": "", "title": "Bucket", "type": "string"}, "Password": {"default": "", "title": "Password", "type": "string"}}, "title": "LoadRequest", "type": "object"}

models/schemas/dock/SaveRequest.json

@@ -0,0 +1 @@
+{"properties": {"Filename": {"default": "", "title": "Filename", "type": "string"}, "Bucket": {"default": "", "title": "Bucket", "type": "string"}, "Password": {"default": "", "title": "Password", "type": "string"}}, "title": "SaveRequest", "type": "object"}

models/schemas/dock/UploadRequest.json

@@ -0,0 +1 @@
+{"properties": {"Type": {"title": "Type", "type": "integer"}, "Data": {"title": "Data", "type": "string"}, "Password": {"title": "Password", "type": "string"}}, "required": ["Type", "Data", "Password"], "title": "UploadRequest", "type": "object"}

src/vbl_aquarium/models/dock.py

@@ -4,26 +4,34 @@
 
 
 # Models for sending data to dock server
-class BucketModel(VBLBaseModel):
+class BucketRequest(VBLBaseModel):
     token: str
     password: str
 
-
-class UploadModel(VBLBaseModel):
+class UploadRequest(VBLBaseModel):
+    type: int
     data: str
     password: str
 
-class DownloadModel(VBLBaseModel):
+class DownloadRequest(VBLBaseModel):
     password: str
 
+class DownloadResponse(VBLBaseModel):
+    type: str
+    data: str
+
 # Models for sending save/load messages
-class SaveModel(VBLBaseModel):
+class SaveRequest(VBLBaseModel):
     filename: str = ''
     bucket: str = ''
     password: str = ''
 
 
-class LoadModel(VBLBaseModel):
+class LoadRequest(VBLBaseModel):
     filename: str = ''
     bucket: str = ''
     password: str = ''
+
+class LoadModel(VBLBaseModel):
+    types: list[int]
+    data: list[str]