Rename Submission.to_dict to as_body. Fix encode and decode.

fkdosilovic · fkdosilovic · commit a3eed7dac5c5 · 2024-11-16T18:50:05.000+01:00
diff --git a/src/judge0/clients.py b/src/judge0/clients.py
@@ -92,8 +92,7 @@ def create_submission(self, submission: Submission) -> Submission:
             "wait": "false",
         }
 
-        # TODO: Rename to_dict to as_body that accepts the client.
-        body = submission.to_dict(self)
+        body = submission.as_body(self)
 
         resp = requests.post(
             f"{self.endpoint}/submissions",
@@ -147,7 +146,7 @@ def create_submissions(self, submissions: list[Submission]) -> list[Submission]:
                     f"{submission.language}!"
                 )
 
-        submissions_body = [submission.to_dict(self) for submission in submissions]
+        submissions_body = [submission.as_body(self) for submission in submissions]
 
         resp = requests.post(
             f"{self.endpoint}/submissions/batch",
diff --git a/src/judge0/common.py b/src/judge0/common.py
@@ -1,9 +1,20 @@
 from base64 import b64decode, b64encode
+from typing import Union
 
 
-def encode(text: str) -> str:
-    return b64encode(bytes(text, "utf-8")).decode()
+def encode(content: Union[bytes, str]) -> str:
+    if isinstance(content, bytes):
+        return b64encode(content).decode()
+    if isinstance(content, str):
+        return b64encode(content.encode()).decode()
+    raise ValueError(f"Unsupported type. Expected bytes or str, got {type(content)}!")
 
 
-def decode(b64_encoded_str: str) -> str:
-    return b64decode(b64_encoded_str.encode()).decode(errors="backslashreplace")
+def decode(content: Union[bytes, str]) -> str:
+    if isinstance(content, bytes):
+        return b64decode(content.decode(errors="backslashreplace")).decode(
+            errors="backslashreplace"
+        )
+    if isinstance(content, str):
+        return b64decode(content.encode()).decode(errors="backslashreplace")
+    raise ValueError(f"Unsupported type. Expected bytes or str, got {type(content)}!")
diff --git a/src/judge0/submission.py b/src/judge0/submission.py
@@ -144,18 +144,16 @@ def set_attributes(self, attributes):
 
             setattr(self, attr, value)
 
-    # TODO: Rename to as_body that accepts a Client.
-    def to_dict(self, client: "Client") -> dict:
+    def as_body(self, client: "Client") -> dict:
         body = {
             "source_code": encode(self.source_code),
             "language_id": client.get_language_id(self.language),
         }
 
-        # TODO: Iterate over ENCODED_REQUEST_FIELDS.
-        if self.stdin is not None:
-            body["stdin"] = encode(self.stdin)
-        if self.expected_output is not None:
-            body["expected_output"] = encode(self.expected_output)
+        for field in ENCODED_REQUEST_FIELDS:
+            value = getattr(self, field)
+            if value is not None:
+                body[field] = encode(value)
 
         for field in EXTRA_REQUEST_FIELDS:
             value = getattr(self, field)

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@ def create_submission(self, submission: Submission) -> Submission:`
`92`	`92`	`"wait": "false",`
`93`	`93`	`}`
`94`	`94`
`95`		`- # TODO: Rename to_dict to as_body that accepts the client.`
`96`		`- body = submission.to_dict(self)`
	`95`	`+ body = submission.as_body(self)`
`97`	`96`
`98`	`97`	`resp = requests.post(`
`99`	`98`	`f"{self.endpoint}/submissions",`
`@@ -147,7 +146,7 @@ def create_submissions(self, submissions: list[Submission]) -> list[Submission]:`
`147`	`146`	`f"{submission.language}!"`
`148`	`147`	`)`
`149`	`148`
`150`		`- submissions_body = [submission.to_dict(self) for submission in submissions]`
	`149`	`+ submissions_body = [submission.as_body(self) for submission in submissions]`
`151`	`150`
`152`	`151`	`resp = requests.post(`
`153`	`152`	`f"{self.endpoint}/submissions/batch",`