wordlift-sdk 2.11.0__tar.gz → 2.13.0__tar.gz

{wordlift_sdk-2.11.0 → wordlift_sdk-2.13.0}/PKG-INFO

@@ -1,15 +1,16 @@
 Metadata-Version: 2.4
 Name: wordlift-sdk
-Version: 2.11.0
+Version: 2.13.0
 Summary: 
 Author: David Riccitelli
 Author-email: david@wordlift.io
-Requires-Python: >=3.10,<3.14
+Requires-Python: >=3.10,<3.15
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: advertools (>0.16.6,<1.0.0)
 Requires-Dist: aiohttp (>=3.10.5,<4.0.0)
 Requires-Dist: google-auth (>=2.35.0,<3.0.0)
@@ -46,7 +47,7 @@ pip install wordlift-sdk
 poetry add wordlift-sdk
 ```
 
-Requires Python 3.10–3.13.
+Requires Python 3.10–3.14.
 
 ## Configuration
 
@@ -120,7 +121,7 @@ Add `.ttl.liquid` files under `data/templates`. Templates render with `account`
 
 ## Validation
 
-SHACL validation utilities and generated Google Search Gallery shapes are included. Carousel `ListItem` requirements are scoped under `ItemList` when both types are present to avoid enforcing carousel constraints on non-carousel lists (for example, `BreadcrumbList`).
+SHACL validation utilities and generated Google Search Gallery shapes are included. When a feature includes both container types (for example `ItemList`, `BreadcrumbList`, `QAPage`, `FAQPage`, `Quiz`, `ProfilePage`, `Product`, `Recipe`, `Course`) and their contained types (`ListItem`, `Question`, `Answer`, `Comment`, `Offer`, `HowToStep`, `Person`, `Organization`), the generator scopes the contained constraints under the container properties to avoid enforcing them on unrelated nodes.
 
 ## Testing
 

{wordlift_sdk-2.11.0 → wordlift_sdk-2.13.0}/README.md

@@ -18,7 +18,7 @@ pip install wordlift-sdk
 poetry add wordlift-sdk
 ```
 
-Requires Python 3.10–3.13.
+Requires Python 3.10–3.14.
 
 ## Configuration
 
@@ -92,7 +92,7 @@ Add `.ttl.liquid` files under `data/templates`. Templates render with `account`
 
 ## Validation
 
-SHACL validation utilities and generated Google Search Gallery shapes are included. Carousel `ListItem` requirements are scoped under `ItemList` when both types are present to avoid enforcing carousel constraints on non-carousel lists (for example, `BreadcrumbList`).
+SHACL validation utilities and generated Google Search Gallery shapes are included. When a feature includes both container types (for example `ItemList`, `BreadcrumbList`, `QAPage`, `FAQPage`, `Quiz`, `ProfilePage`, `Product`, `Recipe`, `Course`) and their contained types (`ListItem`, `Question`, `Answer`, `Comment`, `Offer`, `HowToStep`, `Person`, `Organization`), the generator scopes the contained constraints under the container properties to avoid enforcing them on unrelated nodes.
 
 ## Testing
 

{wordlift_sdk-2.11.0 → wordlift_sdk-2.13.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wordlift-sdk"
-version = "2.11.0"
+version = "2.13.0"
 description = ""
 authors = ["David Riccitelli <david@wordlift.io>"]
 readme = "README.md"
@@ -8,7 +8,7 @@ packages = [{ include = "wordlift_sdk" }]
 include = ["wordlift_sdk/graphql/data/**"]
 
 [tool.poetry.dependencies]
-python = ">=3.10, <3.14"
+python = ">=3.10, <3.15"
 gql = { extras = ["aiohttp"], version = "^3.5.2" }
 tenacity = "^9.0.0"
 aiohttp = "^3.10.5"

{wordlift_sdk-2.11.0 → wordlift_sdk-2.13.0}/wordlift_sdk/validation/generator.py

@@ -169,13 +169,135 @@ def _prop_path(prop: str) -> str:
     return f"( {seq} )"
 
 
+_SCOPED_CHILD_RULES: dict[str, dict[str, list[str]]] = {
+    "ItemList": {"itemListElement": ["ListItem"]},
+    "BreadcrumbList": {"itemListElement": ["ListItem"]},
+    "QAPage": {"mainEntity": ["Question"]},
+    "FAQPage": {"mainEntity": ["Question"]},
+    "Quiz": {"hasPart": ["Question"]},
+    "ProfilePage": {"mainEntity": ["Person", "Organization"]},
+    "Question": {
+        "acceptedAnswer": ["Answer"],
+        "suggestedAnswer": ["Answer"],
+        "comment": ["Comment"],
+    },
+    "Answer": {"comment": ["Comment"]},
+    "Product": {"offers": ["Offer"]},
+    "Recipe": {"recipeInstructions": ["HowToStep"], "step": ["HowToStep"]},
+    "Course": {"provider": ["Organization"], "hasPart": ["Course", "CreativeWork"]},
+}
+
+
+def _emit_property(
+    lines: list[str],
+    prop: str,
+    required: bool,
+    child_types: list[str] | None,
+    indent: int,
+    buckets: dict[str, dict[str, set[str]]],
+    visited: set[str],
+) -> None:
+    sp = " " * indent
+    path = _prop_path(prop)
+    lines.append(f"{sp}sh:property [")
+    lines.append(f"{sp}  sh:path {path} ;")
+    lines.append(f"{sp}  sh:minCount 1 ;")
+    if not required:
+        lines.append(f"{sp}  sh:severity sh:Warning ;")
+        lines.append(f'{sp}  sh:message "Recommended by Google: {prop}." ;')
+    if child_types:
+        valid_children = [
+            child_type
+            for child_type in child_types
+            if child_type not in visited and child_type in buckets
+        ]
+        if len(valid_children) == 1:
+            child_type = valid_children[0]
+            child_bucket = buckets.get(child_type)
+            node_indent = indent + 2
+            node_sp = " " * node_indent
+            lines.append(f"{node_sp}sh:node [")
+            _emit_node(
+                lines,
+                child_type,
+                child_bucket,
+                node_indent + 2,
+                buckets,
+                visited | {child_type},
+            )
+            lines.append(f"{node_sp}] ;")
+        elif len(valid_children) > 1:
+            or_indent = indent + 2
+            or_sp = " " * or_indent
+            lines.append(f"{or_sp}sh:or (")
+            for child_type in valid_children:
+                child_bucket = buckets.get(child_type)
+                lines.append(f"{or_sp}  [")
+                _emit_node(
+                    lines,
+                    child_type,
+                    child_bucket,
+                    or_indent + 4,
+                    buckets,
+                    visited | {child_type},
+                )
+                lines.append(f"{or_sp}  ]")
+            lines.append(f"{or_sp}) ;")
+    lines.append(f"{sp}] ;")
+
+
+def _emit_node(
+    lines: list[str],
+    type_name: str,
+    bucket: dict[str, set[str]],
+    indent: int,
+    buckets: dict[str, dict[str, set[str]]],
+    visited: set[str],
+) -> None:
+    sp = " " * indent
+    lines.append(f"{sp}a sh:NodeShape ;")
+    lines.append(f"{sp}sh:class schema:{type_name} ;")
+
+    child_rules = _SCOPED_CHILD_RULES.get(type_name, {})
+    for prop in sorted(bucket["required"]):
+        child_types = child_rules.get(prop)
+        _emit_property(
+            lines,
+            prop,
+            required=True,
+            child_types=child_types,
+            indent=indent,
+            buckets=buckets,
+            visited=visited,
+        )
+
+    for prop in sorted(bucket["recommended"]):
+        child_types = child_rules.get(prop)
+        _emit_property(
+            lines,
+            prop,
+            required=False,
+            child_types=child_types,
+            indent=indent,
+            buckets=buckets,
+            visited=visited,
+        )
+
+
 def _write_feature(feature: FeatureData, output_path: Path, overwrite: bool) -> bool:
     if output_path.exists() and not overwrite:
         return False
 
-    scoped_list_item = None
-    if "ItemList" in feature.types and "ListItem" in feature.types:
-        scoped_list_item = feature.types["ListItem"]
+    scoped_types: set[str] = set()
+    for parent_type, rules in _SCOPED_CHILD_RULES.items():
+        if parent_type not in feature.types:
+            continue
+        for child_types in rules.values():
+            for child_type in child_types:
+                if child_type == parent_type:
+                    continue
+                if child_type in feature.types:
+                    scoped_types.add(child_type)
 
     lines: list[str] = []
     slug = output_path.stem
@@ -186,7 +308,8 @@ def _write_feature(feature: FeatureData, output_path: Path, overwrite: bool) ->
     lines.append("")
     lines.append(f"# Source: {feature.url}")
     lines.append(
-        f"# Generated: {datetime.now(timezone.utc).isoformat(timespec='seconds')}Z"
+        "# Generated: "
+        f"{datetime.now(timezone.utc).isoformat(timespec='seconds').replace('+00:00', 'Z')}"
     )
     lines.append(
         "# Notes: required properties => errors; recommended properties => warnings."
@@ -194,7 +317,7 @@ def _write_feature(feature: FeatureData, output_path: Path, overwrite: bool) ->
     lines.append("")
 
     for type_name in sorted(feature.types.keys()):
-        if scoped_list_item and type_name == "ListItem":
+        if type_name in scoped_types:
             continue
         bucket = feature.types[type_name]
         shape_name = f":google_{type_name}Shape"
@@ -203,56 +326,28 @@ def _write_feature(feature: FeatureData, output_path: Path, overwrite: bool) ->
         lines.append(f"  sh:targetClass schema:{type_name} ;")
 
         for prop in sorted(bucket["required"]):
-            if (
-                scoped_list_item
-                and type_name == "ItemList"
-                and prop == "itemListElement"
-            ):
-                lines.append("  sh:property [")
-                lines.append("    sh:path schema:itemListElement ;")
-                lines.append("    sh:minCount 1 ;")
-                lines.append("    sh:node [")
-                lines.append("      a sh:NodeShape ;")
-                lines.append("      sh:class schema:ListItem ;")
-                for item_prop in sorted(scoped_list_item["required"]):
-                    item_path = _prop_path(item_prop)
-                    lines.append("      sh:property [")
-                    lines.append(f"        sh:path {item_path} ;")
-                    lines.append("        sh:minCount 1 ;")
-                    lines.append("      ] ;")
-                for item_prop in sorted(scoped_list_item["recommended"]):
-                    item_path = _prop_path(item_prop)
-                    lines.append("      sh:property [")
-                    lines.append(f"        sh:path {item_path} ;")
-                    lines.append("        sh:minCount 1 ;")
-                    lines.append("        sh:severity sh:Warning ;")
-                    lines.append(
-                        f'        sh:message "Recommended by Google: {item_prop}." ;'
-                    )
-                    lines.append("      ] ;")
-                lines.append("    ] ;")
-                lines.append("  ] ;")
-                continue
-            path = _prop_path(prop)
-            lines.append("  sh:property [")
-            lines.append(f"    sh:path {path} ;")
-            lines.append("    sh:minCount 1 ;")
-            lines.append("  ] ;")
+            child_types = _SCOPED_CHILD_RULES.get(type_name, {}).get(prop)
+            _emit_property(
+                lines,
+                prop,
+                required=True,
+                child_types=child_types,
+                indent=2,
+                buckets=feature.types,
+                visited={type_name},
+            )
 
         for prop in sorted(bucket["recommended"]):
-            if (
-                scoped_list_item
-                and type_name == "ItemList"
-                and prop == "itemListElement"
-            ):
-                continue
-            path = _prop_path(prop)
-            lines.append("  sh:property [")
-            lines.append(f"    sh:path {path} ;")
-            lines.append("    sh:minCount 1 ;")
-            lines.append("    sh:severity sh:Warning ;")
-            lines.append(f'    sh:message "Recommended by Google: {prop}." ;')
-            lines.append("  ] ;")
+            child_types = _SCOPED_CHILD_RULES.get(type_name, {}).get(prop)
+            _emit_property(
+                lines,
+                prop,
+                required=False,
+                child_types=child_types,
+                indent=2,
+                buckets=feature.types,
+                visited={type_name},
+            )
 
         lines.append(".")
         lines.append("")
@@ -426,7 +521,8 @@ def generate_schema_shacls(output_file: Path, overwrite: bool) -> int:
     lines.append("")
     lines.append(f"# Source: {SCHEMA_JSONLD_URL}")
     lines.append(
-        f"# Generated: {datetime.now(timezone.utc).isoformat(timespec='seconds')}Z"
+        "# Generated: "
+        f"{datetime.now(timezone.utc).isoformat(timespec='seconds').replace('+00:00', 'Z')}"
     )
     lines.append(
         "# Notes: schema.org grammar checks only; all constraints are warnings."

{wordlift_sdk-2.11.0 → wordlift_sdk-2.13.0}/wordlift_sdk/validation/shacls/google-breadcrumb.ttl

@@ -3,7 +3,7 @@
 @prefix schema: <http://schema.org/> .
 
 # Source: https://developers.google.com/search/docs/appearance/structured-data/breadcrumb
-# Generated: 2026-01-13T11:23:15Z
+# Generated: 2026-02-04T20:00:50Z
 # Notes: required properties => errors; recommended properties => warnings.
 
 :google_BreadcrumbListShape
@@ -12,22 +12,21 @@
   sh:property [
     sh:path schema:itemListElement ;
     sh:minCount 1 ;
-  ] ;
-.
-
-:google_ListItemShape
-  a sh:NodeShape ;
-  sh:targetClass schema:ListItem ;
-  sh:property [
-    sh:path schema:item ;
-    sh:minCount 1 ;
-  ] ;
-  sh:property [
-    sh:path schema:name ;
-    sh:minCount 1 ;
-  ] ;
-  sh:property [
-    sh:path schema:position ;
-    sh:minCount 1 ;
+    sh:node [
+      a sh:NodeShape ;
+      sh:class schema:ListItem ;
+      sh:property [
+        sh:path schema:item ;
+        sh:minCount 1 ;
+      ] ;
+      sh:property [
+        sh:path schema:name ;
+        sh:minCount 1 ;
+      ] ;
+      sh:property [
+        sh:path schema:position ;
+        sh:minCount 1 ;
+      ] ;
+    ] ;
   ] ;
 .

{wordlift_sdk-2.11.0 → wordlift_sdk-2.13.0}/wordlift_sdk/validation/shacls/google-carousel.ttl

@@ -3,7 +3,7 @@
 @prefix schema: <http://schema.org/> .
 
 # Source: https://developers.google.com/search/docs/appearance/structured-data/carousel
-# Generated: 2026-02-04T18:12:24+00:00Z
+# Generated: 2026-02-04T20:00:51Z
 # Notes: required properties => errors; recommended properties => warnings.
 
 :google_ItemListShape

{wordlift_sdk-2.11.0 → wordlift_sdk-2.13.0}/wordlift_sdk/validation/shacls/google-course.ttl

@@ -3,7 +3,7 @@
 @prefix schema: <http://schema.org/> .
 
 # Source: https://developers.google.com/search/docs/appearance/structured-data/course
-# Generated: 2026-01-13T11:23:18Z
+# Generated: 2026-02-04T20:09:17Z
 # Notes: required properties => errors; recommended properties => warnings.
 
 :google_CourseShape
@@ -29,15 +29,15 @@
   a sh:NodeShape ;
   sh:targetClass schema:ItemList ;
   sh:property [
-    sh:path schema:itemListElement ;
+    sh:path ( schema:ListItem schema:position ) ;
     sh:minCount 1 ;
   ] ;
   sh:property [
-    sh:path schema:position ;
+    sh:path ( schema:ListItem schema:url ) ;
     sh:minCount 1 ;
   ] ;
   sh:property [
-    sh:path schema:url ;
+    sh:path schema:itemListElement ;
     sh:minCount 1 ;
   ] ;
 .

{wordlift_sdk-2.11.0 → wordlift_sdk-2.13.0}/wordlift_sdk/validation/shacls/google-education-qa.ttl

@@ -3,26 +3,9 @@
 @prefix schema: <http://schema.org/> .
 
 # Source: https://developers.google.com/search/docs/appearance/structured-data/education-qa
-# Generated: 2026-01-13T11:23:22Z
+# Generated: 2026-02-04T20:00:52Z
 # Notes: required properties => errors; recommended properties => warnings.
 
-:google_QuestionShape
-  a sh:NodeShape ;
-  sh:targetClass schema:Question ;
-  sh:property [
-    sh:path schema:acceptedAnswer ;
-    sh:minCount 1 ;
-  ] ;
-  sh:property [
-    sh:path schema:eduQuestionType ;
-    sh:minCount 1 ;
-  ] ;
-  sh:property [
-    sh:path schema:text ;
-    sh:minCount 1 ;
-  ] ;
-.
-
 :google_QuizShape
   a sh:NodeShape ;
   sh:targetClass schema:Quiz ;
@@ -37,6 +20,22 @@
   sh:property [
     sh:path schema:hasPart ;
     sh:minCount 1 ;
+    sh:node [
+      a sh:NodeShape ;
+      sh:class schema:Question ;
+      sh:property [
+        sh:path schema:acceptedAnswer ;
+        sh:minCount 1 ;
+      ] ;
+      sh:property [
+        sh:path schema:eduQuestionType ;
+        sh:minCount 1 ;
+      ] ;
+      sh:property [
+        sh:path schema:text ;
+        sh:minCount 1 ;
+      ] ;
+    ] ;
   ] ;
   sh:property [
     sh:path schema:text ;
@@ -49,10 +48,10 @@
     sh:message "Recommended by Google: about." ;
   ] ;
   sh:property [
-    sh:path schema:alignmentType ;
+    sh:path ( schema:about schema:name ) ;
     sh:minCount 1 ;
     sh:severity sh:Warning ;
-    sh:message "Recommended by Google: alignmentType." ;
+    sh:message "Recommended by Google: about.name." ;
   ] ;
   sh:property [
     sh:path schema:educationalAlignment ;
@@ -61,15 +60,15 @@
     sh:message "Recommended by Google: educationalAlignment." ;
   ] ;
   sh:property [
-    sh:path schema:name ;
+    sh:path ( schema:educationalAlignment schema:alignmentType ) ;
     sh:minCount 1 ;
     sh:severity sh:Warning ;
-    sh:message "Recommended by Google: name." ;
+    sh:message "Recommended by Google: educationalAlignment.alignmentType." ;
   ] ;
   sh:property [
-    sh:path schema:targetName ;
+    sh:path ( schema:educationalAlignment schema:targetName ) ;
     sh:minCount 1 ;
     sh:severity sh:Warning ;
-    sh:message "Recommended by Google: targetName." ;
+    sh:message "Recommended by Google: educationalAlignment.targetName." ;
   ] ;
 .

wordlift_sdk-2.13.0/wordlift_sdk/validation/shacls/google-faqpage.ttl

@@ -0,0 +1,36 @@
+@prefix : <https://wordlift.io/shacl/google/google-faqpage/> .
+@prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix schema: <http://schema.org/> .
+
+# Source: https://developers.google.com/search/docs/appearance/structured-data/faqpage
+# Generated: 2026-02-04T20:00:53Z
+# Notes: required properties => errors; recommended properties => warnings.
+
+:google_FAQPageShape
+  a sh:NodeShape ;
+  sh:targetClass schema:FAQPage ;
+  sh:property [
+    sh:path schema:mainEntity ;
+    sh:minCount 1 ;
+    sh:node [
+      a sh:NodeShape ;
+      sh:class schema:Question ;
+      sh:property [
+        sh:path schema:acceptedAnswer ;
+        sh:minCount 1 ;
+        sh:node [
+          a sh:NodeShape ;
+          sh:class schema:Answer ;
+          sh:property [
+            sh:path schema:text ;
+            sh:minCount 1 ;
+          ] ;
+        ] ;
+      ] ;
+      sh:property [
+        sh:path schema:name ;
+        sh:minCount 1 ;
+      ] ;
+    ] ;
+  ] ;
+.