update jobs capacity api

CHANGELOG.D/1872.feature

@@ -0,0 +1 @@
+Change jobs capacity API endpoint.

docs/jobs_reference.rst

@@ -87,7 +87,7 @@ Jobs
       :return: Asynchronous context manager which can be used to access
                stdin/stdout/stderr, see :class:`StdStream` for details.
 
-   .. comethod:: get_capacity(presets: Mapping[str, Preset]) -> Mapping[str, int]
+   .. comethod:: get_capacity() -> Mapping[str, int]
 
       Get counts of available job for current cluster for each available preset.
 
@@ -98,8 +98,6 @@ Jobs
       The returned capacity is an approximation, the real value can differ if already
       running jobs are finished or another user starts own jobs at the same time.
 
-      :param presets: presets mapping, as :attr:`Config.presets` attribute.
-
       :return: A mapping of *preset_name* to *count*, where *count* is a number of
                concurrent jobs that can be executed using *preset_name*.
 

neuromation/api/jobs.py

@@ -44,7 +44,6 @@
 )
 from .parser import DiskVolume, Parser, SecretFile, Volume
 from .parsing_utils import LocalImage, RemoteImage, _as_repo_str, _is_in_neuro_registry
-from .server_cfg import Preset
 from .url_utils import (
     normalize_disk_uri,
     normalize_secret_uri,
@@ -674,19 +673,10 @@ async def send_signal(self, id: str, signal: Union[str, int]) -> None:
         async with self._core.request("POST", url, auth=auth) as resp:
             resp
 
-    async def get_capacity(self, presets: Mapping[str, Preset]) -> Mapping[str, int]:
-        url = self._config.monitoring_url / "available"
+    async def get_capacity(self) -> Mapping[str, int]:
+        url = self._config.monitoring_url / "capacity"
         auth = await self._config._api_auth()
-        payload: Dict[str, Any] = {}
-        for name, preset in presets.items():
-            payload[name] = {
-                "cpu": preset.cpu,
-                "memory_mb": preset.memory_mb,
-                "gpu": preset.gpu or 0,
-                "gpu_model": preset.gpu_model or "",
-                "is_preemptible": preset.is_preemptible,
-            }
-        async with self._core.request("POST", url, auth=auth, json=payload) as resp:
+        async with self._core.request("GET", url, auth=auth) as resp:
             return await resp.json()
 
 

neuromation/cli/config.py

@@ -33,7 +33,7 @@ async def show(root: Root) -> None:
     """
     fmt = ConfigFormatter()
     try:
-        jobs_capacity = await root.client.jobs.get_capacity(root.client.config.presets)
+        jobs_capacity = await root.client.jobs.get_capacity()
     except ClientConnectionError:
         jobs_capacity = {}
     root.print(fmt(root.client.config, jobs_capacity))

tests/api/test_jobs.py

@@ -27,7 +27,6 @@
     _job_description_from_api,
 )
 from neuromation.api.parser import SecretFile
-from neuromation.api.server_cfg import Preset
 from tests import _TestServerFactory
 
 
@@ -2422,33 +2421,13 @@ async def test_get_capacity(
     aiohttp_server: _TestServerFactory, make_client: _MakeClient
 ) -> None:
     async def handler(request: web.Request) -> web.Response:
-        payload = await request.json()
-        assert payload == {
-            "gpu-p": {
-                "cpu": 0.1,
-                "memory_mb": 100,
-                "gpu": 1,
-                "gpu_model": "nvidia-tesla-k80",
-                "is_preemptible": True,
-            }
-        }
         return web.json_response({"cpu-micro": 10})
 
     app = web.Application()
-    app.router.add_post("/jobs/available", handler)
+    app.router.add_get("/jobs/capacity", handler)
 
     srv = await aiohttp_server(app)
 
     async with make_client(srv.make_url("/")) as client:
-        result = await client.jobs.get_capacity(
-            {
-                "gpu-p": Preset(
-                    cpu=0.1,
-                    memory_mb=100,
-                    gpu=1,
-                    gpu_model="nvidia-tesla-k80",
-                    is_preemptible=True,
-                )
-            }
-        )
+        result = await client.jobs.get_capacity()
         assert result == {"cpu-micro": 10}