Skip to content

Commit

Permalink
feat: removing duplicate model specs, adding UploadModel to dock
Browse files Browse the repository at this point in the history
  • Loading branch information
dbirman committed Mar 21, 2024
1 parent 794a44e commit 513d161
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 42 deletions.
1 change: 1 addition & 0 deletions models/csharp/dock/LoadModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
public struct LoadModel
{
public string Bucket;
public string Password;
}
8 changes: 8 additions & 0 deletions models/csharp/dock/UploadModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@



public struct UploadModel
{
public string Data;
public string Password;
}
9 changes: 0 additions & 9 deletions models/csharp/urchin/BucketModel.cs

This file was deleted.

7 changes: 0 additions & 7 deletions models/csharp/urchin/LoadModel.cs

This file was deleted.

8 changes: 0 additions & 8 deletions models/csharp/urchin/SaveModel.cs

This file was deleted.

2 changes: 1 addition & 1 deletion models/schemas/dock/LoadModel.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"properties": {"Bucket": {"title": "Bucket", "type": "string"}}, "required": ["Bucket"], "title": "LoadModel", "type": "object"}
{"properties": {"Bucket": {"title": "Bucket", "type": "string"}, "Password": {"title": "Password", "type": "string"}}, "required": ["Bucket", "Password"], "title": "LoadModel", "type": "object"}
1 change: 1 addition & 0 deletions models/schemas/dock/UploadModel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"properties": {"Data": {"title": "Data", "type": "string"}, "Password": {"title": "Password", "type": "string"}}, "required": ["Data", "Password"], "title": "UploadModel", "type": "object"}
1 change: 0 additions & 1 deletion models/schemas/urchin/BucketModel.json

This file was deleted.

1 change: 0 additions & 1 deletion models/schemas/urchin/LoadModel.json

This file was deleted.

1 change: 0 additions & 1 deletion models/schemas/urchin/SaveModel.json

This file was deleted.

26 changes: 12 additions & 14 deletions src/vbl_aquarium/models/dock.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@

# File IO


# Models for sending data to dock server
class BucketModel(VBLBaseModel):
token: str
bucket: str
password: str
token: str
bucket: str
password: str

class UploadModel(VBLBaseModel):
data: str
password: str

# Models for sending save/load messages
class SaveModel(VBLBaseModel):
bucket: str
password: str


class SaveManagerModel(VBLBaseModel):
bucket: str
manager: str
password: str

bucket: str
password: str

class LoadModel(VBLBaseModel):
bucket: str
bucket: str
password: str

0 comments on commit 513d161

Please sign in to comment.