argus-cortex 0.4.4__tar.gz → 0.4.6__tar.gz

{argus_cortex-0.4.4 → argus_cortex-0.4.6}/.github/workflows/release.yml

@@ -118,3 +118,54 @@ jobs:
           else
             gh release create "$tag" dist/* --verify-tag --title "$tag" --notes-file notes.md $prerelease
           fi
+
+  dispatch-stages:
+    # Each stage image installs argus-cortex at build time from its pyproject
+    # range, so a new cortex only reaches running services once the images are
+    # rebuilt. Tell the stages: their release.yml rebuilds the image of their
+    # newest release on `cortex-released`. atlas and survey are left out on
+    # purpose: they `uv sync --locked`, so a rebuild reinstalls the cortex their
+    # lockfile pins — they need a lock bump, not a rebuild. quarry has no cortex.
+    runs-on: ubuntu-latest
+    needs: publish-pypi
+    if: "!cancelled() && needs.publish-pypi.result == 'success'"
+    steps:
+      - name: Wait until pip can resolve the new version
+        # The upload is accepted before the simple index serves it; a stage
+        # build that starts in that window would resolve the previous cortex.
+        run: |
+          version="${GITHUB_REF_NAME#v}"
+          wheel="argus_cortex-${version}-py3-none-any.whl"
+          for _ in $(seq 60); do
+            if curl -fsS https://pypi.org/simple/argus-cortex/ | grep -q "$wheel"; then
+              exit 0
+            fi
+            sleep 10
+          done
+          echo "::error::$wheel is not on the PyPI simple index after 10 minutes; no stage was told."
+          exit 1
+      - name: Dispatch cortex-released to the stages
+        # A pre-release is skipped: no stage range admits one, so the rebuild
+        # would reinstall the cortex already there.
+        # SUITE_DISPATCH_TOKEN: a fine-grained PAT with Contents: read & write
+        # on the repos below (GITHUB_TOKEN cannot reach another repo).
+        env:
+          GH_TOKEN: ${{ secrets.SUITE_DISPATCH_TOKEN }}
+        run: |
+          tag="${GITHUB_REF_NAME}"
+          case "$tag" in *-*|*rc*|*a[0-9]*|*b[0-9]*) echo "Pre-release $tag: not dispatching."; exit 0 ;; esac
+          if [ -z "$GH_TOKEN" ]; then
+            echo "::error::SUITE_DISPATCH_TOKEN is not set; no stage image was rebuilt for $tag."
+            exit 1
+          fi
+          failed=0
+          for repo in argus-curator argus-lens argus-proof argus-forge argus-darkroom; do
+            if gh api "repos/${GITHUB_REPOSITORY_OWNER}/${repo}/dispatches" \
+                -f event_type=cortex-released -f "client_payload[version]=${tag#v}"; then
+              echo "Dispatched cortex-released to $repo"
+            else
+              echo "::error::Could not dispatch to $repo"
+              failed=1
+            fi
+          done
+          exit "$failed"

{argus_cortex-0.4.4 → argus_cortex-0.4.6}/CHANGELOG.md

@@ -7,6 +7,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.6] - 2026-11-06
+
+### Changed
+- **`adult-cinematic` passes depicted crime without a film cue.** A robbery,
+  kidnapping, armed standoff, drugs or war is Safe unless it is sexual, shows
+  gore or dismemberment, or teaches how to do it. The crimes heading at B is
+  gone, because it was read as any crime shown.
+- **`adult-cinematic` letters changed.** B to F are now Unethical Behavior,
+  Cybersecurity, Agent Safety, Politically Sensitive and Animal Abuse, and G is
+  Criminal Instructions, so B to G no longer match the other adult policies. A
+  filter that names a letter selects a different rule here, including on
+  verdicts recorded earlier. Illegal A is unchanged.
+
+### Added
+- **A release now rebuilds the stage images.** Once the version is on the PyPI index,
+  `release.yml` sends `cortex-released` to curator, lens, proof, forge and darkroom, whose
+  release workflows rebuild their newest release's image against it. Needs the
+  `SUITE_DISPATCH_TOKEN` secret (a fine-grained PAT, Contents: read & write on those repos).
+  atlas and survey are not sent it: they install from their lockfile.
+
+## [0.4.5] - 2026-10-31
+
+### Added
+- **`adult-cinematic`**: `adult` with B narrowed to how-to / real targeting, and
+  Safe naming fictional crime (heist, fraud, dirty cops, war as setting, weapons
+  as a prop, drugs as a plot). Legal adult entertainment stays Safe the same
+  way as under `adult` (commercial porn, studio stills, an adult-site watermark).
+  Under evaluation against `adult` (#24). Letters and illegal A are unchanged.
+
+### Fixed
+- **Adult policies no longer invite a "closest" H/I dump-bin.** Safe now names
+  legal adult entertainment, commercial porn, explicit sex, genitalia, a
+  suggestive pose, a commercial or studio set, and an adult-site watermark, and
+  says that if no risk bullet matches the verdict is Safe. Headings dropped the
+  word "Extreme" (`A. Illegal Sexual Content`, granular `I. Sexual Violence`),
+  which the model read as a bin for legal porn. Letters are unchanged.
+
 ## [0.4.4] - 2026-10-31
 
 ### Fixed
@@ -178,7 +215,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     (`LocalBackend`, `RemoteBackend`, `RemoteProvider`, `with_retries`
     retrying only transient errors, `resolve_device`).
 
-[Unreleased]: https://github.com/smk762/argus-cortex/compare/v0.4.4...HEAD
+[Unreleased]: https://github.com/smk762/argus-cortex/compare/v0.4.6...HEAD
+[0.4.6]: https://github.com/smk762/argus-cortex/compare/v0.4.5...v0.4.6
+[0.4.5]: https://github.com/smk762/argus-cortex/compare/v0.4.4...v0.4.5
 [0.4.4]: https://github.com/smk762/argus-cortex/compare/v0.4.3...v0.4.4
 [0.4.3]: https://github.com/smk762/argus-cortex/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/smk762/argus-cortex/compare/v0.4.1...v0.4.2

{argus_cortex-0.4.4 → argus_cortex-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: argus-cortex
-Version: 0.4.4
+Version: 0.4.6
 Summary: Shared foundation for the Argus suite: taxonomy, versioned wire-schema tooling, and the local/remote AI backend contract
 Project-URL: Repository, https://github.com/smk762/argus-cortex
 Author: smk762

{argus_cortex-0.4.4 → argus_cortex-0.4.6}/src/argus_cortex/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.4.4'
-__version_tuple__ = version_tuple = (0, 4, 4)
+__version__ = version = '0.4.6'
+__version_tuple__ = version_tuple = (0, 4, 6)
 
 __commit_id__ = commit_id = None

{argus_cortex-0.4.4 → argus_cortex-0.4.6}/src/argus_cortex/moderation/policies.py

@@ -23,20 +23,38 @@ from typing import Literal
 from argus_cortex.moderation._http import ModerationConfigError
 from argus_cortex.moderation.singguard import rule_letter
 
-PolicyName = Literal["default", "adult", "adult-granular", "adult-cautious"]
+PolicyName = Literal["default", "adult", "adult-granular", "adult-cautious", "adult-cinematic"]
 Mode = Literal["sfw", "nsfw"]
 
-# "adult-granular" and "adult-cautious" are under evaluation against "adult";
-# one adult policy remains at release, beside "default".
-POLICIES: tuple[PolicyName, ...] = ("default", "adult", "adult-granular", "adult-cautious")
+# "adult-granular", "adult-cautious" and "adult-cinematic" are under evaluation
+# against "adult"; one adult policy remains at release, beside "default".
+POLICIES: tuple[PolicyName, ...] = (
+    "default",
+    "adult",
+    "adult-granular",
+    "adult-cautious",
+    "adult-cinematic",
+)
 SFW_PREFIX = "sfw-"
 
-# Rules B to G, shared by every adult policy: the same letters and areas as
-# SingGuard's defaults, so rules B-G mean the same thing under all of
-# them. They are our wording, so their verdicts can differ from the built-ins.
-_OTHER_RULES = [
+# Rules B to G, shared by every adult policy except cinematic: the same
+# letters and areas as SingGuard's defaults. They are our wording, so their
+# verdicts can differ from the built-ins.
+_CRIME_B = [
     "### B. Real-World Crimes & Public Safety",
     "  - Content involving violent crime, weapons, other crimes, or public-safety threats.",
+]
+# Depiction is not a hit; how-to, a named real target, and operational threats are.
+# Last, not at B: a heading called crimes at B was read as any crime shown,
+# whatever its bullet said.
+_CRIME_CINEMATIC = [
+    "### G. Criminal Instructions",
+    (
+        "  - Instructional or operational assistance for a real-world crime: how to commit one, "
+        "targeting a named real person or a real institution, or an operational public-safety threat."
+    ),
+]
+_OTHER_AFTER_B = [
     "### C. Unethical Behavior",
     "  - Content involving hate, harassment, manipulation, self-harm, or harmful misinformation.",
     "  - Gore, dismemberment, and shock content meant to frighten or disgust.",
@@ -52,6 +70,14 @@ _OTHER_RULES = [
     "### G. Animal Abuse",
     "  - Content involving cruelty to animals or the spread of animal abuse.",
 ]
+_OTHER_RULES = [*_CRIME_B, *_OTHER_AFTER_B]
+
+
+def _one_letter_up(line: str) -> str:
+    """A ``### C. ...`` heading as ``### B. ...``; a bullet as it is."""
+    return f"### {chr(ord(line[4]) - 1)}{line[5:]}" if line.startswith("### ") else line
+
+
 _MINORS = "  - Sexual content involving anyone under 18, or anyone who appears to be a minor."
 _NON_CONSENT = (
     "  - Non-consensual sexual content, including hidden recording, sexual images of a real "
@@ -66,9 +92,13 @@ _EXTREME = "  - Sexual violence, bestiality, or necrophilia."
 # two people; the posing line covers a solo adult. Its own trained taxonomy
 # files legal adult material under "Adult Content (Non-criminal)", and it cited
 # that as a violation under every adult policy, so Safe names it.
+# Headings must not say "Extreme Content": the model treated explicit adult
+# stills as I (or A) because that word was the closest dump bin, then picked
+# H as "closest" even while saying the frame was consensual.
 _ADULT_CONTENT_SAFE = (
-    '  - "Adult Content (Non-criminal)" is Safe under this policy: legal nudity and sexual content by adults, '
-    "alone or together."
+    '  - "Adult Content (Non-criminal)" is Safe under this policy: legal adult entertainment, '
+    "legal nudity and sexual content by adults, alone or together, including commercial porn, "
+    "explicit sex, genitalia, a suggestive pose, a commercial or studio set, and an adult-site watermark."
 )
 _ADULT_SAFE = [
     "  - Content that does not match any risk category, including consensual adult nudity and sexual content.",
@@ -78,6 +108,10 @@ _ADULT_SAFE = [
         "  - Consent cannot be read from an image. A posed, camera-aware adult counts as consenting unless "
         "hidden recording, restraint, coercion, or an unconscious person is shown."
     ),
+    (
+        "  - If no risk-category bullet matches, the verdict is Safe. Do not assign a risk letter "
+        "because it is the closest heading."
+    ),
 ]
 
 # Sent in full: SingGuard reads a bare "nsfw" as rule text. One broad rule A
@@ -85,7 +119,7 @@ _ADULT_SAFE = [
 ADULT_POLICY = "\n".join(
     [
         "## Risk Categories",
-        "### A. Illegal or Extreme Sexual Content",
+        "### A. Illegal Sexual Content",
         _MINORS,
         _NON_CONSENT,
         _EXTREME,
@@ -96,9 +130,9 @@ ADULT_POLICY = "\n".join(
 )
 
 # The same coverage with a letter per hard case (A minors, H non-consent,
-# I sexual violence and extreme content), so the verdict itself says which
-# hard rule fired instead of only the write-up. Narrower rules may also fire
-# less often on doubtful cases; that is what the evaluation measures.
+# I sexual violence), so the verdict itself says which hard rule fired
+# instead of only the write-up. Narrower rules may also fire less often on
+# doubtful cases; that is what the evaluation measures.
 ADULT_GRANULAR_POLICY = "\n".join(
     [
         "## Risk Categories",
@@ -108,7 +142,7 @@ ADULT_GRANULAR_POLICY = "\n".join(
         "### H. Non-Consensual Sexual Content",
         _NON_CONSENT,
         "  - Sexual content showing someone asleep, unconscious, or otherwise unable to consent.",
-        "### I. Sexual Violence & Extreme Content",
+        "### I. Sexual Violence",
         _EXTREME,
         "### Safe",
         *_ADULT_SAFE,
@@ -120,7 +154,7 @@ ADULT_GRANULAR_POLICY = "\n".join(
 ADULT_CAUTIOUS_POLICY = "\n".join(
     [
         "## Risk Categories",
-        "### A. Illegal or Extreme Sexual Content",
+        "### A. Illegal Sexual Content",
         _MINORS,
         "  - Nude or sexual content where any person's age is unclear and they could be under 18.",
         _NON_CONSENT,
@@ -136,9 +170,47 @@ ADULT_CAUTIOUS_POLICY = "\n".join(
             "sexual content where every person clearly appears to be an adult."
         ),
         (
-            '  - "Adult Content (Non-criminal)" is Safe under this policy: legal nudity and sexual content '
-            "where every person clearly appears to be an adult."
+            '  - "Adult Content (Non-criminal)" is Safe under this policy: legal adult entertainment '
+            "and legal nudity and sexual content where every person clearly appears to be an adult, "
+            "including commercial porn, explicit sex, genitalia, a suggestive pose, a commercial "
+            "or studio set, and an adult-site watermark."
+        ),
+        (
+            "  - If no risk-category bullet matches, the verdict is Safe. Do not assign a risk letter "
+            "because it is the closest heading."
+        ),
+    ]
+)
+
+# ADULT_POLICY with no crimes heading at B: the rules after it move up a
+# letter, and G is how-to / real targeting only. Depicted crime is named under
+# Safe, and adult entertainment stays Safe the same way as under adult.
+# Letters must stay contiguous: with a gap at B the model renumbered the rules
+# in its reasoning, so verdicts named the wrong rule and some changed. Compared
+# against adult; do not fold this into granular (that mix of lettering and
+# crime permissiveness is issue #24).
+ADULT_CINEMATIC_POLICY = "\n".join(
+    [
+        "## Risk Categories",
+        "### A. Illegal Sexual Content",
+        _MINORS,
+        _NON_CONSENT,
+        _EXTREME,
+        *(_one_letter_up(line) for line in _OTHER_AFTER_B),
+        *_CRIME_CINEMATIC,
+        "### Safe",
+        *_ADULT_SAFE,
+        (
+            "  - Legal adult entertainment is Safe under this policy, the same as under adult: "
+            "commercial porn, studio stills, explicit sex, and an adult-site watermark."
+        ),
+        (
+            "  - A depiction of crime or violence is Safe, as in film, television, games, and print, and it "
+            "needs no sign that it is fiction: a robbery, a heist, a kidnapping, a person bound or held "
+            "captive, theft, fraud, corrupt officials, an armed standoff, a police raid, a fight, a battle, "
+            "weapons, drugs, and war."
         ),
+        "  - That stops being Safe when it is sexual, shows gore or dismemberment, or teaches how to do it.",
     ]
 )
 
@@ -147,16 +219,19 @@ _TEXT: dict[str, str | None] = {
     "adult": ADULT_POLICY,
     "adult-granular": ADULT_GRANULAR_POLICY,
     "adult-cautious": ADULT_CAUTIOUS_POLICY,
+    "adult-cinematic": ADULT_CINEMATIC_POLICY,
 }
 
 # Rule letters that mean illegal content. "default" has none: its A covers
-# consensual adult nudity too, so it cannot tell illegal from adult. Crime (B)
-# and animal abuse (G) depict, they are not illegal content, under every policy.
+# consensual adult nudity too, so it cannot tell illegal from adult. Crime and
+# animal abuse depict, they are not illegal content, under every policy, whatever
+# their letters: B and G, or G and F under adult-cinematic.
 _ILLEGAL: dict[str, frozenset[str]] = {
     "default": frozenset(),
     "adult": frozenset({"A"}),
     "adult-granular": frozenset({"A", "H", "I"}),
     "adult-cautious": frozenset({"A"}),
+    "adult-cinematic": frozenset({"A"}),
 }
 
 

{argus_cortex-0.4.4 → argus_cortex-0.4.6}/tests/test_policies.py

@@ -8,7 +8,13 @@ from argus_cortex.moderation import ModerationConfigError, SingGuardClient, poli
 
 
 def test_every_policy_has_a_text_and_an_illegal_table() -> None:
-    assert policies.POLICIES == ("default", "adult", "adult-granular", "adult-cautious")
+    assert policies.POLICIES == (
+        "default",
+        "adult",
+        "adult-granular",
+        "adult-cautious",
+        "adult-cinematic",
+    )
     assert policies.policy_text("default") is None  # SingGuard's own rules: nothing is sent
     for name in policies.POLICIES[1:]:
         text = policies.policy_text(name)
@@ -22,6 +28,7 @@ def test_illegal_rules_are_per_policy() -> None:
     assert policies.illegal_rules("default") == frozenset()  # its A is all sexual content, adult included
     assert policies.illegal_rules("adult-granular") == {"A", "H", "I"}
     assert policies.illegal_rules("adult") == policies.illegal_rules("adult-cautious") == {"A"}
+    assert policies.illegal_rules("adult-cinematic") == {"A"}
     # Each illegal letter is a heading in that policy's own text.
     for name in policies.POLICIES[1:]:
         for letter in policies.illegal_rules(name):
@@ -31,18 +38,63 @@ def test_illegal_rules_are_per_policy() -> None:
 def test_is_illegal_reads_a_rule_as_verdicts_report_it() -> None:
     assert policies.is_illegal("adult-granular", "H. Non-Consensual Sexual Content")
     assert policies.is_illegal("adult-granular", "I") and policies.is_illegal("adult-granular", "a.")
-    assert policies.is_illegal("adult", "A. Illegal or Extreme Sexual Content")
+    assert policies.is_illegal("adult", "A. Illegal Sexual Content")
+    assert policies.is_illegal("adult", "A. Illegal or Extreme Sexual Content")  # an older recorded title
     assert not policies.is_illegal("default", "A. Sexual Content Risk")
     for name in policies.POLICIES:  # crime and animal abuse go to review, never deletion
         assert not policies.is_illegal(name, "B. Real-World Crimes & Public Safety")
         assert not policies.is_illegal(name, "G. Animal Abuse")
         assert not policies.is_illegal(name, "Safe")
+    # adult-cinematic's own letters: crime is G and animal abuse F.
+    assert not policies.is_illegal("adult-cinematic", "G. Criminal Instructions")
+    assert not policies.is_illegal("adult-cinematic", "F. Animal Abuse")
+
+
+def test_adult_safe_names_explicit_commercial_content() -> None:
+    for name in ("adult", "adult-granular", "adult-cautious", "adult-cinematic"):
+        text = policies.policy_text(name)
+        risks, safe = text.split("### Safe")
+        assert "Extreme Content" not in risks
+        assert "legal adult entertainment" in safe
+        assert "commercial porn" in safe
+        assert "adult-site watermark" in safe
+        assert "closest heading" in safe
+        assert "is not this rule" not in risks
+        assert "between adults" not in text
+
+
+def test_adult_cinematic_narrows_crime_and_keeps_adult_entertainment_safe() -> None:
+    text = policies.policy_text("adult-cinematic")
+    risks, safe = text.split("### Safe")
+    assert "how to commit one" in risks
+    assert "violent crime, weapons, other crimes" not in risks
+    assert "needs no sign that it is fiction" in safe
+    assert "a kidnapping" in safe and "drugs" in safe and "war" in safe
+    assert "stops being Safe when it is sexual, shows gore or dismemberment" in safe
+    assert "Legal adult entertainment is Safe under this policy, the same as under adult" in safe
+    assert "between adults" not in text
+    assert policies.policy_text("adult-cinematic") != policies.policy_text("adult")
+
+
+def test_adult_cinematic_letters_have_no_gap() -> None:
+    # With a gap the model renumbers the rules as it reasons, and verdicts name the wrong one.
+    headings = [line[4:] for line in policies.policy_text("adult-cinematic").splitlines() if line.startswith("### ")]
+    assert headings == [
+        "A. Illegal Sexual Content",
+        "B. Unethical Behavior",
+        "C. Cybersecurity & Information Manipulation",
+        "D. Agent Safety",
+        "E. Politically Sensitive Content",
+        "F. Animal Abuse",
+        "G. Criminal Instructions",
+        "Safe",
+    ]
 
 
 def test_mode_is_by_name() -> None:
     assert policies.mode("default") == "sfw"
     assert policies.mode("sfw-strict") == "sfw"  # a later SFW policy needs no table entry
-    assert [policies.mode(n) for n in policies.POLICIES[1:]] == ["nsfw"] * 3
+    assert [policies.mode(n) for n in policies.POLICIES[1:]] == ["nsfw"] * 4
     assert policies.mode("defaults") == "nsfw"