datoon 1.7.0__tar.gz → 1.7.1__tar.gz

{datoon-1.7.0 → datoon-1.7.1}/.github/workflows/publish-mcp.yml

@@ -1,15 +1,18 @@
 name: Publish to MCP Registry
 
-# Publishes server.json to the official MCP Registry after a GitHub Release.
+# Publishes server.json to the official MCP Registry after a release.
 # Ownership is proven via GitHub OIDC (namespace io.github.andrii-su/*) and the
 # `mcp-name: io.github.andrii-su/datoon` token in the PyPI package README.
 #
-# Runs after publish.yml has pushed the tagged version to PyPI, so the registry
-# can validate the package + ownership token for the released version.
+# Keys off the Release workflow's completion (GITHUB_TOKEN-created releases do
+# not fire `release: published`). Runs only when main HEAD carries a new version
+# tag, and waits for that version to appear on PyPI before publishing, so it
+# never races the parallel Publish to PyPI workflow.
 
 on:
-  release:
-    types: [published]
+  workflow_run:
+    workflows: ["Release"]
+    types: [completed]
   workflow_dispatch:
 
 permissions:
@@ -18,16 +21,32 @@ permissions:
 
 jobs:
   publish:
+    if: >-
+      github.event_name == 'workflow_dispatch'
+      || github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+        with:
+          ref: main
+          fetch-depth: 0
 
-      - name: Resolve release version
+      - name: Resolve version to publish
         id: version
-        run: echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
+        run: |
+          version="$(git tag --points-at HEAD | sed 's/^v//' | head -1)"
+          if [ -z "$version" ] && [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            version="$(git describe --tags --abbrev=0 | sed 's/^v//')"
+          fi
+          echo "version=${version}" >> "$GITHUB_OUTPUT"
+          if [ -z "$version" ]; then
+            echo "No release tag at HEAD - nothing to publish."
+          else
+            echo "Publishing datoon ${version} to the MCP Registry."
+          fi
 
-      - name: Sync server.json version to release tag
-        if: github.event_name == 'release'
+      - name: Sync server.json version
+        if: steps.version.outputs.version != ''
         run: |
           version="${{ steps.version.outputs.version }}"
           tmp="$(mktemp)"
@@ -38,16 +57,18 @@ jobs:
           cat server.json
 
       - name: Install mcp-publisher
+        if: steps.version.outputs.version != ''
         run: |
           curl -sSL "https://github.com/modelcontextprotocol/registry/releases/latest/download/mcp-publisher_linux_amd64.tar.gz" \
             | tar -xz mcp-publisher
           sudo mv mcp-publisher /usr/local/bin/
 
       - name: Validate server.json
+        if: steps.version.outputs.version != ''
         run: mcp-publisher validate
 
       - name: Wait for the released version to appear on PyPI
-        if: github.event_name == 'release'
+        if: steps.version.outputs.version != ''
         run: |
           version="${{ steps.version.outputs.version }}"
           url="https://pypi.org/pypi/datoon/${version}/json"
@@ -64,7 +85,9 @@ jobs:
           exit 1
 
       - name: Login via GitHub OIDC
+        if: steps.version.outputs.version != ''
         run: mcp-publisher login github-oidc
 
       - name: Publish to MCP Registry
+        if: steps.version.outputs.version != ''
         run: mcp-publisher publish

datoon-1.7.1/.github/workflows/publish.yml

@@ -0,0 +1,82 @@
+name: Publish to PyPI
+
+# Releases are cut by the Release workflow using GITHUB_TOKEN, and GitHub does
+# not fire `release: published` for events created by GITHUB_TOKEN. So this
+# workflow keys off the Release workflow's completion instead, and publishes
+# only when the current main HEAD carries a new version tag.
+
+on:
+  workflow_run:
+    workflows: ["Release"]
+    types: [completed]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  build:
+    if: >-
+      github.event_name == 'workflow_dispatch'
+      || github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.ver.outputs.version }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: main
+          fetch-depth: 0
+
+      - name: Resolve version to publish
+        id: ver
+        run: |
+          version="$(git tag --points-at HEAD | sed 's/^v//' | head -1)"
+          if [ -z "$version" ] && [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            version="$(git describe --tags --abbrev=0 | sed 's/^v//')"
+          fi
+          echo "version=${version}" >> "$GITHUB_OUTPUT"
+          if [ -z "$version" ]; then
+            echo "No release tag at HEAD - nothing to publish."
+          else
+            echo "Publishing datoon ${version}."
+          fi
+
+      - name: Check out the exact release tag
+        if: steps.ver.outputs.version != ''
+        run: git checkout "v${{ steps.ver.outputs.version }}"
+
+      - name: Install uv
+        if: steps.ver.outputs.version != ''
+        uses: astral-sh/setup-uv@v7
+
+      - name: Build distributions
+        if: steps.ver.outputs.version != ''
+        run: uv build
+
+      - name: Upload distributions
+        if: steps.ver.outputs.version != ''
+        uses: actions/upload-artifact@v7
+        with:
+          name: dist
+          path: dist/
+
+  publish:
+    needs: build
+    if: needs.build.outputs.version != ''
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/project/datoon/
+    steps:
+      - name: Download distributions
+        uses: actions/download-artifact@v8
+        with:
+          name: dist
+          path: dist/
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip-existing: true

{datoon-1.7.0 → datoon-1.7.1}/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.7.1](https://github.com/andrii-su/datoon/compare/v1.7.0...v1.7.1) (2026-06-22)
+
+
+### Bug Fixes
+
+* **mcp:** report datoon version in the MCP initialize handshake ([22ba5fd](https://github.com/andrii-su/datoon/commit/22ba5fd23071cf2fa6a2d2c51d306d761dce9dc4))
+
 # [1.7.0](https://github.com/andrii-su/datoon/compare/v1.6.0...v1.7.0) (2026-06-22)
 
 

{datoon-1.7.0 → datoon-1.7.1}/MARKETPLACES.md

@@ -22,17 +22,25 @@ ______________________________________________________________________
   [`README.md`](./README.md) (PyPI renders the README as the package description,
   which the registry validates).
 - **Publishing:** [`.github/workflows/publish-mcp.yml`](./.github/workflows/publish-mcp.yml)
-  runs on every GitHub Release. It syncs `server.json`'s version to the release
-  tag, validates, authenticates via **GitHub OIDC** (no stored secret), and runs
-  `mcp-publisher publish`.
+  runs when the **Release** workflow completes (via `workflow_run`), and only
+  when main HEAD carries a new version tag. It syncs `server.json`'s version to
+  that tag, validates, waits for the version to appear on PyPI, authenticates via
+  **GitHub OIDC** (no stored secret), and runs `mcp-publisher publish`.
 
 > [!NOTE]
-> The ownership token first reaches PyPI with the release that includes this
-> change. The publish workflow validates against the released version on PyPI,
-> so the first successful registry publish happens on the **next** release after
-> this is merged.
+> **Trigger note.** Releases are cut by semantic-release using `GITHUB_TOKEN`,
+> and GitHub does not fire `release: published` for `GITHUB_TOKEN`-created
+> events. Both [`publish.yml`](./.github/workflows/publish.yml) (PyPI) and
+> publish-mcp.yml therefore key off the **Release** workflow's completion
+> instead, gated on a new tag at HEAD.
 
-Manual publish (if needed):
+> [!NOTE]
+> The ownership token first reaches PyPI with the release that includes the
+> marketplace change. The first successful publish happens on the next release
+> after that merge.
+
+Manual publish — **Publish to MCP Registry** workflow → **Run workflow**
+(`workflow_dispatch`); it publishes the latest tag. Or locally:
 
 ```bash
 # Install mcp-publisher (see modelcontextprotocol/registry releases)
@@ -41,8 +49,6 @@ mcp-publisher login github        # interactive OAuth, namespace io.github.andri
 mcp-publisher publish
 ```
 
-Re-run via the **Publish to MCP Registry** workflow's `workflow_dispatch`.
-
 ______________________________________________________________________
 
 ## 2. Smithery — one-time connect

{datoon-1.7.0 → datoon-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datoon
-Version: 1.7.0
+Version: 1.7.1
 Summary: Smart structured-data-to-TOON gateway with pragmatic auto-gating for LLM prompts.
 Author-email: Andrii Suruhov <andrii.suruhov@gmail.com>
 License: MIT License

{datoon-1.7.0 → datoon-1.7.1}/src/datoon/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.7.0'
-__version_tuple__ = version_tuple = (1, 7, 0)
+__version__ = version = '1.7.1'
+__version_tuple__ = version_tuple = (1, 7, 1)
 
-__commit_id__ = commit_id = 'g50cf0e107'
+__commit_id__ = commit_id = 'g7a983c8dc'

{datoon-1.7.0 → datoon-1.7.1}/src/datoon/mcp_server.py

@@ -12,6 +12,7 @@ except ImportError as exc:
         "MCP support requires the 'mcp' extra: pip install datoon[mcp]"
     ) from exc
 
+from datoon import __version__
 from datoon.analyzer import analyze_payload
 from datoon.converter import DatoonError, convert_json_for_llm
 from datoon.models import ConversionConfig
@@ -25,6 +26,10 @@ mcp = FastMCP(
         "Use analyze_json to check if a payload is a good TOON candidate without converting."
     ),
 )
+# FastMCP has no `version` parameter; set it on the underlying server so the
+# MCP `initialize` handshake reports datoon's version instead of the mcp
+# library's default.
+mcp._mcp_server.version = __version__
 
 
 @mcp.tool()

{datoon-1.7.0 → datoon-1.7.1}/src/datoon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datoon
-Version: 1.7.0
+Version: 1.7.1
 Summary: Smart structured-data-to-TOON gateway with pragmatic auto-gating for LLM prompts.
 Author-email: Andrii Suruhov <andrii.suruhov@gmail.com>
 License: MIT License

{datoon-1.7.0 → datoon-1.7.1}/src/datoon.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "1.7.0",
+  "tag": "1.7.1",
   "distance": 0,
-  "node": "g50cf0e1074cf8076f98cdc712c69b94e2b531f4a",
+  "node": "g7a983c8dcb2664bc8656790578bfc4a48a7f47c3",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-06-22"

datoon-1.7.0/.github/workflows/publish.yml

@@ -1,45 +0,0 @@
-name: Publish to PyPI
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-  id-token: write
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-
-      - name: Build distributions
-        run: uv build
-
-      - name: Upload distributions
-        uses: actions/upload-artifact@v7
-        with:
-          name: dist
-          path: dist/
-
-  publish:
-    needs: build
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/project/datoon/
-    steps:
-      - name: Download distributions
-        uses: actions/download-artifact@v8
-        with:
-          name: dist
-          path: dist/
-
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1