new symphony folder with new folder structure and packages + removed old orchestration framework

symphony/client/simbricks/client/client.py

+# Copyright 2024 Max Planck Institute for Software Systems, and
+# National University of Singapore
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+import aiohttp
+import typing
+import contextlib
+from .auth import TokenProvider
+from simbricks.orchestration import system
+from simbricks.orchestration import simulation
+from simbricks.orchestration import instantiation
+
+
+class BaseClient:
+    def __init__(self, base_url="https://app.simbricks.io/api"):
+        self._base_url = base_url
+        self._token_provider = TokenProvider()
+
+    async def _get_headers(self) -> dict:
+        headers = {}
+        token = await self._token_provider.access_token()
+        headers["Authorization"] = f"Bearer {token}"
+        headers["accept"] = "application/json"
+        headers["Content-Type"] = "application/json"
+        return headers
+
+    @contextlib.asynccontextmanager
+    async def session(self) -> typing.AsyncIterator[aiohttp.ClientSession]:
+        headers = await self._get_headers()
+        session = aiohttp.ClientSession(headers=headers)
+        try:
+            yield session
+        finally:
+            await session.close()
+
+    @contextlib.asynccontextmanager
+    async def post(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+
+        url = f"{self._base_url}{url}"
+
+        async with self.session() as session:
+            async with session.post(
+                url=url, data=data, **kwargs
+            ) as resp:  # TODO: handel connection error
+                print(await resp.text())
+                resp.raise_for_status()  # TODO: handel gracefully
+                yield resp
+
+    @contextlib.asynccontextmanager
+    async def put(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+
+        url = f"{self._base_url}{url}"
+
+        async with self.session() as session:
+            async with session.put(
+                url=url, data=data, **kwargs
+            ) as resp:  # TODO: handel connection error
+                print(await resp.text())
+                resp.raise_for_status()  # TODO: handel gracefully
+                yield resp
+
+    @contextlib.asynccontextmanager
+    async def get(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+
+        url = f"{self._base_url}{url}"
+        async with self.session() as session:
+            async with session.get(
+                url=url, data=data, **kwargs
+            ) as resp:  # TODO: handel connection error
+                resp.raise_for_status()  # TODO: handel gracefully
+                yield resp
+
+    async def info(self):
+        async with self.get(url="/info") as resp:
+            return await resp.json()
+
+
+class NSClient:
+    def __init__(self, base_client: BaseClient = BaseClient(), namespace: str = ""):
+        self._base_client: BaseClient = base_client
+        self._namespace = namespace
+        self._session: aiohttp.ClientSession | None = None
+
+    def _build_ns_prefix(self, url: str) -> str:
+        return f"/ns/{self._namespace}/-{url}"
+
+    @contextlib.asynccontextmanager
+    async def post(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+        async with self._base_client.post(
+            url=self._build_ns_prefix(url=url), data=data, **kwargs
+        ) as resp:
+            yield resp
+
+    @contextlib.asynccontextmanager
+    async def put(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+        async with self._base_client.put(
+            url=self._build_ns_prefix(url=url), data=data, **kwargs
+        ) as resp:
+            yield resp
+
+    @contextlib.asynccontextmanager
+    async def get(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+
+        async with self._base_client.get(
+            url=self._build_ns_prefix(url=url), data=data, **kwargs
+        ) as resp:
+            yield resp
+
+    async def info(self):
+        async with self.get(url="/info") as resp:
+            return await resp.json()
+
+
+class SimBricksClient:
+
+    def __init__(self, ns_client: NSClient = NSClient()) -> None:
+        self._ns_client: NSClient = ns_client
+
+    async def info(self):
+        async with self._ns_client.get("/systems/info") as resp:
+            return await resp.json()
+
+    async def create_system(self, system: system.System) -> dict:
+        json_obj = {"sb_json": system.toJSON()}
+        async with self._ns_client.post(url="/systems", json=json_obj) as resp:
+            return await resp.json()
+
+    async def get_systems(self) -> list[dict]:
+        async with self._ns_client.get(url="/systems") as resp:
+            return await resp.json()
+
+    async def get_system(self, system_id: int) -> dict:
+        async with self._ns_client.get(url=f"/systems/{system_id}") as resp:
+            return await resp.json()
+
+    async def create_simulation(
+        self, system_db_id: int, simulation: simulation.Simulation
+    ) -> simulation.Simulation:
+        json_obj = {
+            "system_id": system_db_id, 
+            "sb_json": simulation.toJSON()
+        }
+        print(json_obj)
+        async with self._ns_client.post(url="/simulations", json=json_obj) as resp:
+            return await resp.json()
+
+    async def get_simulation(self, simulation_id: int) -> dict:
+        async with self._ns_client.get(url=f"/simulations/{simulation_id}") as resp:
+            return await resp.json()
+        
+    async def get_simulations(self) -> list[dict]:
+        async with self._ns_client.get(url="/simulations") as resp:
+            return await resp.json()
+
+    async def create_instantiation(
+        self, sim_db_id: int, instantiation: simulation.Simulation
+    ) -> simulation.Simulation:
+        json_obj = {
+            "simulation_id": sim_db_id,
+            "sb_json": {} # FIXME
+        }
+        print(json_obj)
+        async with self._ns_client.post(url="/instantiations", json=json_obj) as resp:
+            return await resp.json()
+
+    async def get_instantiation(
+        self, instantiation_id: int
+    ) -> instantiation.Instantiation:
+        async with self._ns_client.get(url=f"/instantiations/{instantiation_id}") as resp:
+            return await resp.json()
+
+    async def create_run(
+        self, inst_db_id: int
+    ) -> dict:
+        json_obj = {
+            "instantiation_id": inst_db_id,
+            "state": "pending",
+            "output": "",
+        }
+        async with self._ns_client.post(url="/runs", json=json_obj) as resp:
+            return await resp.json()
+
+    async def get_run(self, run_id: int) -> dict:
+        async with self._ns_client.get(url=f"/runs/{run_id}") as resp:
+            return await resp.json()
+
+    async def get_runs(self) -> [dict]:
+        async with self._ns_client.get(url=f"/runs") as resp:
+            return await resp.json()
+
+
+
+class RunnerClient:
+
+    def __init__(self, ns_client, id: int) -> None:
+        self._ns_client: NSClient = ns_client
+        self._runner_id = id
+
+    def _build_prefix(self, url: str) -> str:
+        return f"/runners/{self._runner_id}{url}"
+
+    @contextlib.asynccontextmanager
+    async def post(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+        async with self._ns_client.post(
+            url=self._build_prefix(url=url), data=data, **kwargs
+        ) as resp:
+            yield resp
+
+    @contextlib.asynccontextmanager
+    async def put(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+        async with self._ns_client.put(
+            url=self._build_prefix(url=url), data=data, **kwargs
+        ) as resp:
+            yield resp
+
+    @contextlib.asynccontextmanager
+    async def get(
+        self, url: str, data: typing.Any = None, **kwargs: typing.Any
+    ) -> typing.AsyncIterator[aiohttp.ClientResponse]:
+
+        async with self._ns_client.get(
+            url=self._build_prefix(url=url), data=data, **kwargs
+        ) as resp:
+            yield resp
+
+
+    async def next_run(
+        self
+    ) -> dict | None:
+        async with self.get(f"/next_run") as resp:
+            if resp.status == 200:
+                return await resp.json()
+            elif resp.status == 202:
+                return None
+            else:
+                resp.raise_for_status()
+
+
+    async def update_run(
+        self,
+        run_id: int,
+        state: str,
+        output: str,
+    ) -> None:
+        obj = {
+            'state': state,
+            'output': output,
+            'id': run_id,
+            'instantiation_id': 42,
+        }
+        async with self.put(url=f"/update_run/{run_id}", json=obj) as resp:
+            ret = await resp.json()
\ No newline at end of file

symphony/local/pyproject.toml

+# Copyright 2024 Max Planck Institute for Software Systems, and
+# National University of Singapore
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry]
+name = "simbricks-local"
+version = "0.0.1"
+description = "simbricks lib to execute a simbricks experiment locally"
+authors = [ "Jakob Görgen <jakob@simbricks.io>", ]
+packages = [
+  { include = "simbricks" }
+]

symphony/local/requirements.txt

+# Copyright 2024 Max Planck Institute for Software Systems, and
+# National University of Singapore
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# external dependencies
+
+# local dependencies
+-e ../orchestration
+-e ../runtime
\ No newline at end of file

experiments/run_new.py → symphony/local/simbricks/local/run_new.py

@@ -38,10 +38,10 @@ from simbricks.orchestration import exectools
 from simbricks.orchestration.simulation import base as sim_base
 from simbricks.orchestration.simulation import output as sim_out
 from simbricks.orchestration.instantiation import base as inst_base
-from simbricks.orchestration.runtime_new.runs import base as runs_base
-from simbricks.orchestration.runtime_new.runs import base as runs_base
-from simbricks.orchestration.runtime_new.runs import local as rt_local
-from simbricks.orchestration.runtime_new import command_executor
+from simbricks.orchestration.runtime.runs import base as runs_base
+from simbricks.orchestration.runtime.runs import base as runs_base
+from simbricks.orchestration.runtime.runs import local as rt_local
+from simbricks.orchestration.runtime import command_executor
 
 
 def parse_args() -> argparse.Namespace:

symphony/orchestration/pyproject.toml

+# Copyright 2024 Max Planck Institute for Software Systems, and
+# National University of Singapore
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry]
+name = "simbricks-orchestration"
+version = "0.0.1"
+description = "simbricks orchestration lib"
+authors = [ "Jakob Görgen <jakob@simbricks.io>", ]
+packages = [
+  { include = "simbricks" }
+]

symphony/orchestration/requirements.txt

+# Copyright 2024 Max Planck Institute for Software Systems, and
+# National University of Singapore
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# external dependencies
+
+# local dependencies
+-e ../utils
\ No newline at end of file

experiments/simbricks/orchestration/helpers/simulation.py → symphony/orchestration/simbricks/orchestration/helpers/simulation.py

@@ -23,7 +23,7 @@
 from simbricks.orchestration import system
 from simbricks.orchestration.simulation import base as sim_base
 from simbricks.orchestration.simulation import channel as sim_chan
-from simbricks.orchestration.utils import base as utils_base
+from simbricks.utils import base as utils_base
 
 
 def add_specs(simulator: sim_base.Simulator, *specifications) -> None:

experiments/simbricks/orchestration/instantiation/base.py → symphony/orchestration/simbricks/orchestration/instantiation/base.py

@@ -28,13 +28,13 @@ import shutil
 import typing
 import itertools
 import copy
-from simbricks.orchestration.utils import base as util_base
+from simbricks.utils import base as util_base
 from simbricks.orchestration.system import base as sys_base
 from simbricks.orchestration.system import pcie as sys_pcie
 from simbricks.orchestration.system import mem as sys_mem
 from simbricks.orchestration.system import eth as sys_eth
 from simbricks.orchestration.system.host import disk_images
-from simbricks.orchestration.runtime_new import command_executor
+from simbricks.runtime import command_executor
 
 if typing.TYPE_CHECKING:
     from simbricks.orchestration.simulation import base as sim_base

experiments/simbricks/orchestration/simulation/base.py → symphony/orchestration/simbricks/orchestration/simulation/base.py

@@ -28,7 +28,7 @@ import typing as tp
 import simbricks.orchestration.system as sys_conf
 import simbricks.orchestration.instantiation.base as inst_base
 import simbricks.orchestration.simulation.channel as sim_chan
-import simbricks.orchestration.utils.base as utils_base
+import simbricks.utils.base as utils_base
 
 if tp.TYPE_CHECKING:
     from simbricks.orchestration.simulation import (

experiments/simbricks/orchestration/simulation/channel.py → symphony/orchestration/simbricks/orchestration/simulation/channel.py

@@ -26,7 +26,7 @@ import enum
 
 from simbricks.orchestration.simulation import base as sim_base
 from simbricks.orchestration.system import base as system_base
-from simbricks.orchestration.utils import base as utils_base
+from simbricks.utils import base as utils_base
 
 
 class Time(enum.IntEnum):

experiments/simbricks/orchestration/simulation/host.py → symphony/orchestration/simbricks/orchestration/simulation/host.py

@@ -30,7 +30,7 @@ from simbricks.orchestration.instantiation import base as inst_base
 from simbricks.orchestration.system import host as sys_host
 from simbricks.orchestration.system import pcie as sys_pcie
 from simbricks.orchestration.system import mem as sys_mem
-from simbricks.orchestration.utils import base as utils_base
+from simbricks.utils import base as utils_base
 
 
 class HostSim(sim_base.Simulator):