aiohttp-tiny-mcp 0.5.0__tar.gz → 0.5.1__tar.gz

{aiohttp_tiny_mcp-0.5.0 → aiohttp_tiny_mcp-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiohttp-tiny-mcp
-Version: 0.5.0
+Version: 0.5.1
 Summary: Remote MCP server and client library for aiohttp
 License-Expression: Apache-2.0
 License-File: LICENSE

{aiohttp_tiny_mcp-0.5.0 → aiohttp_tiny_mcp-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aiohttp-tiny-mcp"
-version = "0.5.0"
+version = "0.5.1"
 description = "Remote MCP server and client library for aiohttp"
 readme = "README.md"
 license = "Apache-2.0"

{aiohttp_tiny_mcp-0.5.0 → aiohttp_tiny_mcp-0.5.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "aiohttp-tiny-mcp"
-version = "0.5.0"
+version = "0.5.1"
 description = "Remote MCP server and client library for aiohttp"
 readme = "README.md"
 license = "Apache-2.0"

{aiohttp_tiny_mcp-0.5.0 → aiohttp_tiny_mcp-0.5.1}/src/aiohttp_tiny_mcp/console/console.css

@@ -70,6 +70,10 @@ body {
   letter-spacing: -0.01em;
 }
 
+.bar h1 > button { font: inherit; letter-spacing: inherit; color: inherit; background: none; border: 0; padding: 0; }
+.bar h1 > button:disabled { opacity: 1; }
+.bar h1 > button:hover:not(:disabled) { text-decoration: underline; }
+
 .field { display: flex; align-items: center; gap: 6px; }
 .field.grow { flex: 1 1 12em; min-width: 0; }
 .field.grow > input { flex: 1 1 auto; min-width: 8em; }
@@ -334,7 +338,12 @@ button.quiet { color: var(--ink-soft); }
 
 .argument { display: flex; flex-direction: column; gap: 3px; }
 
-.argument > label { font-size: 12px; font-weight: 500; }
+.choice-group { display: flex; flex-wrap: wrap; gap: 6px 16px; border: 0; padding: 0; margin: 0; min-width: 0; }
+.choice-group > label { display: flex; align-items: center; gap: 5px; }
+.argument-heading { display: flex; align-items: center; justify-content: space-between; gap: 8px; }
+.argument .null-toggle { display: flex; align-items: center; gap: 4px; color: var(--ink-soft); font-weight: 400; }
+.argument > :disabled { opacity: 0.45; cursor: not-allowed; }
+.argument > label, .argument-heading > label { font-size: 12px; font-weight: 500; }
 .argument .hint { font-size: 11.5px; color: var(--ink-faint); }
 .argument .required { color: var(--bad); margin-left: 3px; }
 

{aiohttp_tiny_mcp-0.5.0 → aiohttp_tiny_mcp-0.5.1}/src/aiohttp_tiny_mcp/console/console.js

@@ -540,6 +540,7 @@ function encodeHeader(value) {
 
 
 const page = {
+  serverTitle: document.getElementById("server-title"),
   authOAuth: document.getElementById("auth-oauth"),
   authOAuthStatus: document.getElementById("auth-oauth-status"),
   authenticate: document.getElementById("authenticate"),
@@ -585,6 +586,7 @@ const page = {
 
 let client = null;
 let chosen = null;
+let serverInstructions = "";
 let endpointUrl = null;
 //: Where the page was told the endpoint is. The field starts from it and may add a query.
 let configuredEndpoint = null;
@@ -886,22 +888,74 @@ function buildFields(schema, into, omit) {
   return fields;
 }
 
+let fieldId = 0;
+
+function fieldChoices(property) {
+  if (Array.isArray(property.enum)) {
+    return property.enum.map((value) => ({ value, title: String(value) }));
+  }
+  if (!Array.isArray(property.oneOf) || !property.oneOf.length) return null;
+  const choices = [];
+  for (const branch of property.oneOf) {
+    if (!branch || typeof branch !== "object") return null;
+    let value;
+    if (branch.type === "null") value = null;
+    else if (Object.hasOwn(branch, "const")) value = branch.const;
+    else if (Array.isArray(branch.enum) && branch.enum.length === 1) value = branch.enum[0];
+    else return null;
+    choices.push({ value, title: branch.title ?? String(value) });
+  }
+  return choices;
+}
+
+function allowsNull(property) {
+  if (property.default === null) return true;
+  if (property.type === "null" || [].concat(property.type || []).includes("null")) return true;
+  if (Object.hasOwn(property, "const") && property.const === null) return true;
+  if (Array.isArray(property.enum) && property.enum.includes(null)) return true;
+  return (property.anyOf || property.oneOf || []).some(allowsNull);
+}
+
 function buildField(name, property, isRequired, into) {
-  const kinds = [].concat(property.type || inferType(property));
-  const kind = kinds.find((one) => one !== "null") || "string";
-  const row = element("div", kind === "boolean" ? "argument flag" : "argument");
+  const nullable = allowsNull(property);
+  const branches = property.anyOf || property.oneOf || [];
+  const nonNull = branches.filter((branch) => branch.type !== "null" &&
+    !(Object.hasOwn(branch, "const") && branch.const === null));
+  const effective = nullable && nonNull.length === 1
+    ? { ...nonNull[0], ...property, enum: property.enum || nonNull[0].enum }
+    : property;
+  const kinds = [].concat(effective.type || inferType(effective));
+  const choices = fieldChoices(effective)?.filter(({ value }) => value !== null);
+  const baseKind = kinds.find((one) => one !== "null") || "string";
+  const itemChoices = baseKind === "array" && effective.items ? fieldChoices(effective.items) : null;
+  const kind = choices ? "choice" : itemChoices ? "choices" : baseKind;
+  const row = element("div", kind === "boolean" && !nullable ? "argument flag" : "argument");
   const label = element("label", null, property.title || name);
   if (isRequired) label.append(element("span", "required", "*"));
   let input;
 
-  if (property.enum) {
+  if (kind === "choices") {
+    input = element("fieldset", "choice-group");
+    input.choiceInputs = itemChoices.map(({ value, title }) => {
+      const option = element("label");
+      const checkbox = element("input");
+      checkbox.type = "checkbox";
+      checkbox.value = JSON.stringify(value);
+      checkbox.checked = Array.isArray(property.default) &&
+        property.default.some((item) => JSON.stringify(item) === checkbox.value);
+      option.append(checkbox, element("span", null, title));
+      input.append(option);
+      return checkbox;
+    });
+  } else if (choices) {
     input = element("select");
     if (!isRequired) input.append(element("option", null, ""));
-    property.enum.forEach((value) => {
-      const option = element("option", null, String(value));
-      option.value = String(value);
+    choices.forEach(({ value, title }) => {
+      const option = element("option", null, title);
+      option.value = JSON.stringify(value);
       input.append(option);
     });
+    if (property.default !== undefined && property.default !== null) input.value = JSON.stringify(property.default);
   } else if (kind === "boolean") {
     input = element("input");
     input.type = "checkbox";
@@ -909,24 +963,44 @@ function buildField(name, property, isRequired, into) {
   } else if (kind === "integer" || kind === "number") {
     input = element("input");
     input.type = "number";
-    if (kind === "integer") input.step = "1";
-    if (property.minimum !== undefined) input.min = property.minimum;
-    if (property.maximum !== undefined) input.max = property.maximum;
-    if (property.default !== undefined) input.value = property.default;
+    input.step = kind === "integer" ? "1" : "any";
+    if (effective.minimum !== undefined) input.min = effective.minimum;
+    if (effective.maximum !== undefined) input.max = effective.maximum;
+    if (property.default !== undefined && property.default !== null) input.value = property.default;
   } else if (kind === "object" || kind === "array") {
     input = element("textarea");
     input.placeholder = kind === "array" ? "[]" : "{}";
-    if (property.default !== undefined) input.value = JSON.stringify(property.default, null, 2);
+    if (property.default !== undefined && property.default !== null) input.value = JSON.stringify(property.default, null, 2);
   } else {
     input = element("input");
     input.type = "text";
-    if (property.default !== undefined) input.value = property.default;
+    if (property.default !== undefined && property.default !== null) input.value = property.default;
   }
 
   input.dataset.name = name;
   input.dataset.kind = kind;
   if (isRequired) input.dataset.required = "1";
-  row.append(label, input);
+  input.id = `argument-${++fieldId}`;
+  label.htmlFor = input.id;
+  if (kind === "choices") {
+    label.id = `${input.id}-label`;
+    input.setAttribute("aria-labelledby", label.id);
+  }
+  const heading = nullable ? element("div", "argument-heading") : row;
+  heading.append(label);
+  if (nullable) {
+    const toggleLabel = element("label", "null-toggle");
+    const toggle = element("input");
+    toggle.type = "checkbox";
+    toggle.checked = property.default === null || property.type === "null" || choices?.length === 0;
+    toggle.onchange = () => { input.disabled = toggle.checked; };
+    toggle.onchange();
+    input.nullToggle = toggle;
+    toggleLabel.append(toggle, element("span", null, "null"));
+    heading.append(toggleLabel);
+    row.append(heading);
+  }
+  row.append(input);
   if (property.description) row.append(element("div", "hint", property.description));
   into.append(row);
   return input;
@@ -941,7 +1015,8 @@ function inferType(property) {
 /* Empty inputs represent absent arguments, including for required-field validation. */
 function missing(fields) {
   return fields.filter(
-    (input) => input.dataset.required && input.dataset.kind !== "boolean" && !input.value.trim()
+    (input) => input.dataset.required && !input.nullToggle?.checked &&
+      !["boolean", "choices"].includes(input.dataset.kind) && !input.value.trim()
   );
 }
 
@@ -950,14 +1025,32 @@ function readFields(fields) {
   fields.forEach((input) => {
     const name = input.dataset.name;
     const kind = input.dataset.kind;
+    if (input.nullToggle?.checked) {
+      values[name] = null;
+      return;
+    }
+    if (kind === "choices") {
+      values[name] = input.choiceInputs.filter((option) => option.checked)
+        .map((option) => JSON.parse(option.value));
+      return;
+    }
     if (kind === "boolean") {
       values[name] = input.checked;
       return;
     }
     const raw = input.value.trim();
+    if (kind === "integer" || kind === "number") {
+      if (input.validity.badInput) throw new Error(`${name}: enter a valid number.`);
+      if (raw === "") return;
+      const value = input.valueAsNumber;
+      if (!Number.isFinite(value) || (kind === "integer" && !Number.isInteger(value))) {
+        throw new Error(`${name}: enter a valid ${kind}.`);
+      }
+      values[name] = value;
+      return;
+    }
     if (raw === "") return; // absent, which is not the same as empty
-    if (kind === "integer") values[name] = parseInt(raw, 10);
-    else if (kind === "number") values[name] = parseFloat(raw);
+    if (kind === "choice") values[name] = JSON.parse(raw);
     else if (kind === "object" || kind === "array") {
       try {
         values[name] = JSON.parse(raw);
@@ -970,8 +1063,56 @@ function readFields(fields) {
 }
 
 
+function rememberToolFields(name, fields) {
+  const key = `mcp-console-form:${JSON.stringify([location.pathname, endpointUrl.href, name])}`;
+  let saved;
+  try {
+    saved = JSON.parse(localStorage.getItem(key));
+  } catch {
+    // Storage can be unavailable or contain an incomplete draft.
+  }
+  for (const input of fields) {
+    const state = saved && Object.hasOwn(saved, input.dataset.name) ? saved[input.dataset.name] : null;
+    if (!state || state.kind !== input.dataset.kind) continue;
+    if (input.choiceInputs && Array.isArray(state.value)) {
+      input.choiceInputs.forEach((option) => { option.checked = state.value.includes(option.value); });
+    } else if (input.dataset.kind === "boolean" && typeof state.value === "boolean") {
+      input.checked = state.value;
+    } else if (typeof state.value === "string") {
+      if (input.dataset.kind !== "choice" || [...input.options].some((option) => option.value === state.value)) {
+        input.value = state.value;
+      }
+    }
+    if (input.nullToggle && typeof state.isNull === "boolean") {
+      input.nullToggle.checked = state.isNull;
+      input.nullToggle.onchange();
+    }
+  }
+  const save = () => {
+    const entries = fields.map((input) => [input.dataset.name, {
+      kind: input.dataset.kind,
+      value: input.choiceInputs
+        ? input.choiceInputs.filter((option) => option.checked).map((option) => option.value)
+        : input.dataset.kind === "boolean" ? input.checked : input.value,
+      isNull: input.nullToggle?.checked || false,
+    }]);
+    try {
+      localStorage.setItem(key, JSON.stringify(Object.fromEntries(entries)));
+    } catch {
+      // Keep the form usable when browser storage is blocked or full.
+    }
+  };
+  for (const input of fields) {
+    input.addEventListener("input", save);
+    input.addEventListener("change", save);
+    if (input.nullToggle) input.nullToggle.addEventListener("change", save);
+  }
+}
+
+
 function show(items, title, into, describe, pick) {
-  if (!items.length) return;
+  if (!items.length) return [];
+  const buttons = [];
   const group = element("div", "group");
   group.append(element("h3", null, title));
   items.forEach((item) => {
@@ -990,8 +1131,10 @@ function show(items, title, into, describe, pick) {
       pick(item);
     };
     group.append(button);
+    buttons.push(button);
   });
   into.append(group);
+  return buttons;
 }
 
 function firstLine(text) {
@@ -1139,7 +1282,8 @@ function plain(text) {
 
 
 function show(items, title, into, describe, pick) {
-  if (!items.length) return;
+  if (!items.length) return [];
+  const buttons = [];
   const group = element("div", "group");
   group.append(element("h3", null, title));
   items.forEach((item) => {
@@ -1158,8 +1302,10 @@ function show(items, title, into, describe, pick) {
       pick(item);
     };
     group.append(button);
+    buttons.push(button);
   });
   into.append(group);
+  return buttons;
 }
 
 function hints(tool) {
@@ -1175,7 +1321,7 @@ async function loadCatalogue() {
   const into = document.createDocumentFragment();
 
   const tools = await client.listTools();
-  show(tools, `Tools (${tools.length})`, into, {
+  const toolButtons = show(tools, `Tools (${tools.length})`, into, {
     label: (tool) => tool.name,
     note: (tool) => firstLine(tool.description),
     tags: hints,
@@ -1223,11 +1369,29 @@ async function loadCatalogue() {
   } else {
     page.catalogue.append(into);
   }
+  restoreTool(tools, toolButtons);
 }
 
+function restoreTool(tools, buttons) {
+  let name;
+  try {
+    name = decodeURIComponent(location.hash.slice(1));
+  } catch {
+    return;
+  }
+  const index = tools.findIndex((tool) => tool.name === name);
+  if (index !== -1) buttons[index].click();
+}
+
+function rememberTool(name) {
+  const url = new URL(location.href);
+  url.hash = name === null ? "" : encodeURIComponent(name);
+  history.replaceState(history.state, "", url);
+}
 
 function choose(what) {
   chosen = what;
+  rememberTool(what.kind === "tool" ? what.item.name : null);
   if (catalogue) catalogue.fold();
   page.outcome.textContent = "";
   page.args.textContent = "";
@@ -1238,6 +1402,7 @@ function choose(what) {
     prose(what.item.description, page.about);
     // Hide retry arguments managed by this client.
     chosen.fields = buildFields(what.item.inputSchema || {}, page.args, DRIVEN);
+    rememberToolFields(what.item.name, chosen.fields);
     page.invoke.textContent = "Call";
   } else if (what.kind === "prompt") {
     page.subject.textContent = what.item.name;
@@ -1697,10 +1862,29 @@ async function invoke() {
 }
 
 
+function setServerInstructions(text) {
+  serverInstructions = text || "";
+  if (page.serverTitle) page.serverTitle.disabled = !serverInstructions;
+}
+
+function showServerInstructions(clearFragment = true) {
+  if (!serverInstructions) return;
+  chosen = null;
+  if (clearFragment) rememberTool(null);
+  page.catalogue.querySelectorAll(".item").forEach((item) => item.classList.remove("chosen"));
+  page.subject.textContent = "Instructions";
+  prose(serverInstructions, page.about);
+  page.args.textContent = "";
+  page.outcome.textContent = "";
+  page.invoke.disabled = true;
+  if (catalogue) catalogue.fold();
+}
+
 function disconnect() {
   // Sessions expire server-side; there is no close request.
   client?.abort.abort();
   client = null;
+  setServerInstructions("");
   chosen = null;
   page.catalogue.textContent = "";
   page.catalogue.append(element("p", "empty", "Connect to see what this server offers."));
@@ -1737,17 +1921,15 @@ async function connect() {
       onQuestion: askPerson,
     });
     const described = await client.initialize();
+    setServerInstructions(described.instructions);
     await loadCatalogue();
     page.refresh.disabled = false;
     const name = (described.serverInfo || (described._meta || {})["io.modelcontextprotocol/serverInfo"] || {}).name;
     say(`${name || "connected"} · ${client.version}`, "on");
     page.connect.textContent = "Disconnect";
-    if (described.instructions) {
-      page.subject.textContent = "Instructions";
-      prose(described.instructions, page.about);
-      page.invoke.disabled = true;
-    }
+    if (!chosen) showServerInstructions(false);
   } catch (error) {
+    setServerInstructions("");
     client = null;
     page.refresh.disabled = true;
     page.revision.disabled = false;
@@ -1825,6 +2007,7 @@ function markTraffic() {
 
 
 function start() {
+  if (page.serverTitle) page.serverTitle.onclick = () => showServerInstructions();
   setupAuthentication();
   Object.keys(REVISIONS).forEach((version) => {
     const option = element("option", null, version);
@@ -1846,7 +2029,10 @@ function start() {
   page.connect.onclick = () => (client ? disconnect() : connect());
   page.refresh.onclick = async () => {
     try {
-      if (client.rules.extensions) await client.initialize();
+      if (client.rules.extensions) {
+        const described = await client.initialize();
+        setServerInstructions(described.instructions);
+      }
       await loadCatalogue();
     } catch (error) {
       say(error.message, "off");

{aiohttp_tiny_mcp-0.5.0 → aiohttp_tiny_mcp-0.5.1}/src/aiohttp_tiny_mcp/console/index.html

@@ -10,7 +10,7 @@
 <body>
 
 <header class="bar">
-  <h1>{{TITLE}}</h1>
+  <h1><button id="server-title" type="button" title="Show server instructions" disabled>{{TITLE}}</button></h1>
   <label class="field grow" title="The path the server serves MCP on. A query string is sent as typed">
     <span>Endpoint</span>
     <input id="endpoint" class="endpoint" type="text" spellcheck="false" autocomplete="off">