Add support for Judge0 Cloud client

Author: hermanzdosilovic

src/judge0/__init__.py

@@ -19,6 +19,9 @@
     ATDJudge0CE,
     ATDJudge0ExtraCE,
     Client,
+    Judge0Cloud,
+    Judge0CloudCE,
+    Judge0CloudExtraCE,
     Rapid,
     RapidJudge0CE,
     RapidJudge0ExtraCE,
@@ -39,6 +42,9 @@
     "Client",
     "File",
     "Filesystem",
+    "Judge0Cloud",
+    "Judge0CloudCE",
+    "Judge0CloudExtraCE",
     "Language",
     "LanguageAlias",
     "MaxRetries",
@@ -54,12 +60,12 @@
     "SuluJudge0ExtraCE",
     "TestCase",
     "async_execute",
+    "async_run",
     "execute",
     "get_client",
-    "async_run",
-    "sync_run",
     "run",
     "sync_execute",
+    "sync_run",
     "wait",
 ]
 
@@ -122,11 +128,9 @@ def _get_preview_client(flavor: Flavor) -> Union[SuluJudge0CE, SuluJudge0ExtraCE
 def _get_custom_client(flavor: Flavor) -> Union[Client, None]:
     from json import loads
 
-    ce_endpoint = os.getenv("JUDGE0_CE_ENDPOINT", "https://ce.judge0.com")
+    ce_endpoint = os.getenv("JUDGE0_CE_ENDPOINT")
     ce_auth_header = os.getenv("JUDGE0_CE_AUTH_HEADERS")
-    extra_ce_endpoint = os.getenv(
-        "JUDGE0_EXTRA_CE_ENDPOINT", "https://extra-ce.judge0.com"
-    )
+    extra_ce_endpoint = os.getenv("JUDGE0_EXTRA_CE_ENDPOINT")
     extra_ce_auth_header = os.getenv("JUDGE0_EXTRA_CE_AUTH_HEADERS")
 
     if flavor == Flavor.CE and ce_endpoint is not None and ce_auth_header is not None:

src/judge0/clients.py

@@ -715,5 +715,77 @@ def __init__(self, api_key=None, **kwargs):
         super().__init__(self.DEFAULT_ENDPOINT, api_key, **kwargs)
 
 
-CE = (SuluJudge0CE, RapidJudge0CE, ATDJudge0CE)
-EXTRA_CE = (SuluJudge0ExtraCE, RapidJudge0ExtraCE, ATDJudge0ExtraCE)
+class Judge0Cloud(Client):
+    """Base class for all Judge0 Cloud clients.
+
+    Parameters
+    ----------
+    endpoint : str
+        Default request endpoint.
+    auth_headers : str or dict
+        Judge0 Cloud authentication headers, either as a JSON string or a dictionary.
+    **kwargs : dict
+        Additional keyword arguments for the base Client.
+    """
+
+    def __init__(self, endpoint, auth_headers, **kwargs):
+        if isinstance(auth_headers, str):
+            from json import loads
+
+            auth_headers = loads(auth_headers)
+
+        super().__init__(
+            endpoint,
+            auth_headers,
+            **kwargs,
+        )
+
+
+class Judge0CloudCE(Judge0Cloud):
+    """Judge0 Cloud client for CE flavor.
+
+    Parameters
+    ----------
+    endpoint : str
+        Default request endpoint.
+    auth_headers : str or dict
+        Judge0 Cloud authentication headers, either as a JSON string or a dictionary.
+    **kwargs : dict
+        Additional keyword arguments for the base Client.
+    """
+
+    DEFAULT_ENDPOINT: ClassVar[str] = "https://ce.judge0.com"
+    HOME_URL: ClassVar[str] = "https://ce.judge0.com"
+    API_KEY_ENV: ClassVar[str] = "JUDGE0_CLOUD_CE_AUTH_HEADERS"
+
+    def __init__(self, auth_headers, **kwargs):
+        super().__init__(
+            self.DEFAULT_ENDPOINT,
+            auth_headers,
+            **kwargs,
+        )
+
+
+class Judge0CloudExtraCE(Judge0Cloud):
+    """Judge0 Cloud client for Extra CE flavor.
+
+    Parameters
+    ----------
+    endpoint : str
+        Default request endpoint.
+    auth_headers : str or dict
+        Judge0 Cloud authentication headers, either as a JSON string or a dictionary.
+    **kwargs : dict
+        Additional keyword arguments for the base Client.
+    """
+
+    DEFAULT_ENDPOINT: ClassVar[str] = "https://extra-ce.judge0.com"
+    HOME_URL: ClassVar[str] = "https://extra-ce.judge0.com"
+    API_KEY_ENV: ClassVar[str] = "JUDGE0_CLOUD_EXTRA_CE_AUTH_HEADERS"
+
+    def __init__(self, auth_headers, **kwargs):
+        super().__init__(self.DEFAULT_ENDPOINT, auth_headers, **kwargs)
+
+
+CE = (Judge0CloudCE, SuluJudge0CE, RapidJudge0CE, ATDJudge0CE)
+EXTRA_CE = (Judge0CloudExtraCE, SuluJudge0ExtraCE, RapidJudge0ExtraCE, ATDJudge0ExtraCE)

tests/conftest.py

@@ -91,6 +91,26 @@ def sulu_extra_ce_client():
         return clients.SuluJudge0ExtraCE(api_key)
 
 
+@pytest.fixture(scope="session")
+def judge0_cloud_ce_client():
+    auth_headers = os.getenv("JUDGE0_CLOUD_CE_AUTH_HEADERS")
+
+    if auth_headers is None:
+        return None
+    else:
+        return clients.Judge0CloudCE(auth_headers)
+
+
+@pytest.fixture(scope="session")
+def judge0_cloud_extra_ce_client():
+    auth_headers = os.getenv("JUDGE0_CLOUD_EXTRA_CE_AUTH_HEADERS")
+
+    if auth_headers is None:
+        return None
+    else:
+        return clients.Judge0CloudExtraCE(auth_headers)
+
+
 @pytest.fixture(scope="session")
 def preview_ce_client() -> clients.SuluJudge0CE:
     return clients.SuluJudge0CE(retry_strategy=RegularPeriodRetry(0.5))
@@ -104,13 +124,16 @@ def preview_extra_ce_client() -> clients.SuluJudge0ExtraCE:
 @pytest.fixture(scope="session")
 def ce_client(
     custom_ce_client,
+    judge0_cloud_ce_client,
     sulu_ce_client,
     rapid_ce_client,
     atd_ce_client,
     preview_ce_client,
 ):
     if custom_ce_client is not None:
         return custom_ce_client
+    if judge0_cloud_ce_client is not None:
+        return judge0_cloud_ce_client
     if sulu_ce_client is not None:
         return sulu_ce_client
     if rapid_ce_client is not None:
@@ -126,13 +149,16 @@ def ce_client(
 @pytest.fixture(scope="session")
 def extra_ce_client(
     custom_extra_ce_client,
+    judge0_cloud_extra_ce_client,
     sulu_extra_ce_client,
     rapid_extra_ce_client,
     atd_extra_ce_client,
     preview_extra_ce_client,
 ):
     if custom_extra_ce_client is not None:
         return custom_extra_ce_client
+    if judge0_cloud_extra_ce_client is not None:
+        return judge0_cloud_extra_ce_client
     if sulu_extra_ce_client is not None:
         return sulu_extra_ce_client
     if rapid_extra_ce_client is not None:

tests/test_clients.py

@@ -7,6 +7,8 @@
     "rapid_extra_ce_client",
     "sulu_ce_client",
     "sulu_extra_ce_client",
+    "judge0_cloud_ce_client",
+    "judge0_cloud_extra_ce_client",
 )