Skip to content

feat(python): implement Squad #9098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

feat(python): implement Squad #9098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0af32fc
feat(python): extend `ockam.gather`
SanjoDeundiak Jun 10, 2025
64aabfd
feat(python): use `router` to call `litellm`
SanjoDeundiak Jun 10, 2025
b74d19d
feat(python): update 010&011 ui
SanjoDeundiak Jun 10, 2025
8095842
feat(python): implement `Squad`
SanjoDeundiak Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/010/images/main/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM ghcr.io/build-trust/ockam-python:latest
FROM ghcr.io/build-trust/ockam-python:cd3c44c50
COPY . .
ENTRYPOINT ["python", "main.py"]
120 changes: 93 additions & 27 deletions examples/010/images/main/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,69 @@
padding: 6px 12px;
font-size: 14px;
}
@keyframes pulse {
0% {
box-shadow: 0 0 0 0 rgba(0, 123, 255, 0.7);
}
70% {
box-shadow: 0 0 0 10px rgba(0, 123, 255, 0);
}
100% {
box-shadow: 0 0 0 0 rgba(0, 123, 255, 0);
}
#loader {
display: none;
width: 15px;
height: 15px;
margin: 0;
border: 8px solid #f3f3f3;
border-radius: 50%;
border-top: 8px solid #3498db;
-webkit-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
}
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
.pulse {
animation: pulse 1.5s infinite;
border-color: #007bff;
outline: none;
.foo {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
#popup {
display: none;
background-color: rgba(0,0,0,0.5);
position: fixed;
z-index: 999;
width: 100%;
height: 100vh;
flex-direction: column;
justify-content: center;
align-items: center;
margin: 0 auto;
.popup {
background: white;
color: #fff;
padding: 10px;
border-radius: 5px;
display: flex;
flex-direction: column;
align-items: center;
width: 200px;
#text {
color: black;
}
}
}
</style>
</head>
<body>
<button id="run-btn">Run</button>
<div id="popup">
<div class="popup">
<p id="text"></p>
<button id="ok-btn">OK</button>
</div>
</div>
<div class="foo">
<button id="run-btn">Run</button>
<div id="loader"></div>
</div>
<div id="container"></div>
<script src="https://d3js.org/d3.v7.min.js"></script>
<script>
Expand All @@ -83,18 +126,23 @@

const container = d3.select("#container");

function render(data) {
const grouped = {};
for (const worker of data.workers) {
if (!grouped[worker.runner_name]) {
grouped[worker.runner_name] = [];
}
grouped[worker.runner_name].push(worker.worker_name);
}
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}

window.prev_data = {};
function render(data) {
const container = d3.select("#container");

const nodeColumns = container.selectAll(".node-column").data(Object.entries(grouped), (d) => d[0]);
// In case some runners didn't respond due to being buse, use the previous value for that runner
const new_data = {...window.prev_data, ...data};
window.prev_data = {...data};

const data_list = Object.entries(new_data).sort((a, b) => {
return a[0].localeCompare(b[0]);
});

const nodeColumns = container.selectAll(".node-column").data(data_list, (d) => d[0]);
nodeColumns.exit().remove();

const nodeColumnsEnter = nodeColumns.enter().append("div").attr("class", "node-column");
Expand Down Expand Up @@ -154,17 +202,34 @@
});
}

document.getElementById("ok-btn").addEventListener("click", async function () {
const popup = document.getElementById("popup");
popup.style.display = "none"
});

document.getElementById("run-btn").addEventListener("click", async function () {
const button = this;
button.classList.add("pulse");
const loader = document.getElementById("loader");
const popup = document.getElementById("popup");
const text = document.getElementById("text");
button.disabled = true;
loader.style.display = "block";

try {
const start = Date.now();
const response = await fetch("/analyze", { method: "POST" });
const response_json = await response.json();
const end = Date.now();
console.log("Analysis: ", response_json);
text.innerHTML = `Success in: ${Math.floor((end - start) / 1000)} s`;
} catch (error) {
console.error("Error fetching /analyze:", error);
text.innerHTML = "Error"
} finally {
button.classList.remove("pulse");
loader.style.display = "none";
await sleep(1500);
popup.style.display = "flex"
button.disabled = false;
}
});

Expand All @@ -174,7 +239,8 @@
const response = await fetch("/runners/workers");
if (response.ok) {
const response_json = await response.json();
console.log("Workers: ", response_json);
const now = new Date();
console.log(now.toLocaleTimeString(), "Workers:", response_json);
render(response_json);
}
} catch (e) {
Expand Down
25 changes: 17 additions & 8 deletions examples/010/images/main/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,23 @@ def split_list_into_n_parts(lst, n):


async def list_workers(node):
import ockam

runners = await Zone.nodes(node, filter="runner")
futures = [runner.list_workers() for runner in runners]
workers_per_runner = await asyncio.gather(*futures)
workers = []
for runner, workers_on_this_runner in zip(runners, workers_per_runner):
for w in workers_on_this_runner:
workers.append({"worker_name": w["name"], "runner_name": runner.name})
return workers

async def list_per_runner(runner):
workers_on_this_runner = await runner.list_workers()
return {runner.name: [w["name"] for w in workers_on_this_runner]}

futures = [list_per_runner(runner) for runner in runners]
workers_per_runner = await ockam.gather(*futures, timeout=3, return_exceptions=True)

# ignore errors
workers_per_runner = [r for r in workers_per_runner if not isinstance(r, Exception)]
# flatten
workers_per_runner = {k: v for d in workers_per_runner for k, v in d.items()}

return workers_per_runner


class Api:
Expand Down Expand Up @@ -193,7 +202,7 @@ async def post_analyze():
@self.api.get("/runners/workers")
async def get_workers():
workers = await list_workers(node)
return JSONResponse(content={"workers": workers})
return JSONResponse(content=workers)

@self.api.get("/runners")
async def get_runners():
Expand Down
2 changes: 1 addition & 1 deletion examples/010/images/runner/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM ghcr.io/build-trust/ockam-python:latest
FROM ghcr.io/build-trust/ockam-python:cd3c44c50
COPY . .
ENTRYPOINT ["python", "main.py"]
4 changes: 2 additions & 2 deletions examples/011/images/main/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ghcr.io/build-trust/ockam-python-dev:latest AS dev
FROM ghcr.io/build-trust/ockam-python-dev:cd3c44c50 AS dev

ENV PATH="/app/venv/bin:$PATH"
COPY requirements.txt requirements.txt
RUN python -m venv /app/venv && pip install -r requirements.txt

FROM ghcr.io/build-trust/ockam-python:latest
FROM ghcr.io/build-trust/ockam-python:cd3c44c50

WORKDIR /app

Expand Down
120 changes: 93 additions & 27 deletions examples/011/images/main/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,69 @@
padding: 6px 12px;
font-size: 14px;
}
@keyframes pulse {
0% {
box-shadow: 0 0 0 0 rgba(0, 123, 255, 0.7);
}
70% {
box-shadow: 0 0 0 10px rgba(0, 123, 255, 0);
}
100% {
box-shadow: 0 0 0 0 rgba(0, 123, 255, 0);
}
#loader {
display: none;
width: 15px;
height: 15px;
margin: 0;
border: 8px solid #f3f3f3;
border-radius: 50%;
border-top: 8px solid #3498db;
-webkit-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
}
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
.pulse {
animation: pulse 1.5s infinite;
border-color: #007bff;
outline: none;
.foo {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
#popup {
display: none;
background-color: rgba(0,0,0,0.5);
position: fixed;
z-index: 999;
width: 100%;
height: 100vh;
flex-direction: column;
justify-content: center;
align-items: center;
margin: 0 auto;
.popup {
background: white;
color: #fff;
padding: 10px;
border-radius: 5px;
display: flex;
flex-direction: column;
align-items: center;
width: 200px;
#text {
color: black;
}
}
}
</style>
</head>
<body>
<button id="run-btn">Run</button>
<div id="popup">
<div class="popup">
<p id="text"></p>
<button id="ok-btn">OK</button>
</div>
</div>
<div class="foo">
<button id="run-btn">Run</button>
<div id="loader"></div>
</div>
<div id="container"></div>
<script src="https://d3js.org/d3.v7.min.js"></script>
<script>
Expand All @@ -83,18 +126,23 @@

const container = d3.select("#container");

function render(data) {
const grouped = {};
for (const worker of data.workers) {
if (!grouped[worker.runner_name]) {
grouped[worker.runner_name] = [];
}
grouped[worker.runner_name].push(worker.worker_name);
}
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}

window.prev_data = {};
function render(data) {
const container = d3.select("#container");

const nodeColumns = container.selectAll(".node-column").data(Object.entries(grouped), (d) => d[0]);
// In case some runners didn't respond due to being buse, use the previous value for that runner
const new_data = {...window.prev_data, ...data};
window.prev_data = {...data};

const data_list = Object.entries(new_data).sort((a, b) => {
return a[0].localeCompare(b[0]);
});

const nodeColumns = container.selectAll(".node-column").data(data_list, (d) => d[0]);
nodeColumns.exit().remove();

const nodeColumnsEnter = nodeColumns.enter().append("div").attr("class", "node-column");
Expand Down Expand Up @@ -154,17 +202,34 @@
});
}

document.getElementById("ok-btn").addEventListener("click", async function () {
const popup = document.getElementById("popup");
popup.style.display = "none"
});

document.getElementById("run-btn").addEventListener("click", async function () {
const button = this;
button.classList.add("pulse");
const loader = document.getElementById("loader");
const popup = document.getElementById("popup");
const text = document.getElementById("text");
button.disabled = true;
loader.style.display = "block";

try {
const start = Date.now();
const response = await fetch("/analyze", { method: "POST" });
const response_json = await response.json();
const end = Date.now();
console.log("Analysis: ", response_json);
text.innerHTML = `Success in: ${Math.floor((end - start) / 1000)} s`;
} catch (error) {
console.error("Error fetching /analyze:", error);
text.innerHTML = "Error"
} finally {
button.classList.remove("pulse");
loader.style.display = "none";
await sleep(1500);
popup.style.display = "flex"
button.disabled = false;
}
});

Expand All @@ -174,7 +239,8 @@
const response = await fetch("/runners/workers");
if (response.ok) {
const response_json = await response.json();
console.log("Workers: ", response_json);
const now = new Date();
console.log(now.toLocaleTimeString(), "Workers:", response_json);
render(response_json);
}
} catch (e) {
Expand Down
Loading
Loading