@lark-apaas/coding-steering 0.1.18-dev.ec88bb5 → 0.1.18-dev.ee5404f

package/steering/design-html/skills/pptx-style-extract/scripts/query.py

@@ -244,14 +244,10 @@ def _recipe_css(fill, line, radii, effects):
             dash = (line or {}).get('dash')
             style = 'dashed' if dash and 'dash' in dash else 'solid'
             out.append('border: %dpx %s %s' % (w, style, lc))
-    if radii:
+    if radii and all(r >= 1 for r in radii):
         lo, hi = min(radii), max(radii)
         if abs(hi - lo) <= 0.5:
             out.append('border-radius: %gpx' % round(lo, 1))
-        else:
-            out.append('border-radius: %gpx\x00/* 源内 %g~%gpx 共 %d 档，归一档位由 L11 定 */'
-                       % (round(sum(radii) / len(radii), 1), round(lo, 1), round(hi, 1),
-                          len(set(round(r, 1) for r in radii))))
     for e in effects or []:
         if e.get('type') == 'outerShdw':
             col = _css_color(e.get('color')) or 'rgba(0,0,0,0.25)'
@@ -266,8 +262,8 @@ def _recipe_css(fill, line, radii, effects):
 
 def _sig(fill, line, effects):
     """分组键 = 填充 + 描边 + 效果。**不含圆角**——OOXML 圆角是 min(w,h) 的百分比，
-    同一配方在不同尺寸的卡上绝对 px 必然不同（feishu 三张 glassCard 实测 10.8/12.8/19.5），
-    把它计入键会把一个配方拆成三组；归一到哪一档是 L11 的判断，脚本只报区间。"""
+    同一配方在不同尺寸的卡上绝对 px 必然不同，把它计入键会把一个配方拆成多组；
+    只有组内每个形状都明确共享同一绝对半径时才输出组级圆角，否则留给逐形状 CSS。"""
     f = 'none'
     if isinstance(fill, dict):
         if fill.get('type') == 'solid':
@@ -305,8 +301,7 @@ def cmd_recipes(a, outdir):
         g = groups.setdefault(k, {'n': 0, 'parts': Counter(), 'sizes': [], 'radii': [],
                                   'fill': fill, 'line': line, 'fx': fx})
         g['n'] += 1
-        if radius:
-            g['radii'].append(radius)
+        g['radii'].append(radius or 0)
         g['parts'][short(s['part'])] += 1
         b = s.get('box') or {}
         if b.get('w'):

package/steering/design-html/skills/pptx-style-extract/scripts/render_pages.py

@@ -279,18 +279,19 @@ def render_shape(shape, media_url, stats):
 
 HEAD = """<style>
 body{margin:0;background:#2b2b2b;font-family:%s}
-.page{position:relative;width:1920px;height:1080px;overflow:hidden}
+.page{position:relative;width:%dpx;height:%dpx;overflow:hidden}
 .sp{position:absolute;box-sizing:border-box}
 .sp p{margin:0}
 .ph{position:absolute;left:6px;top:4px;font:16px/1.2 monospace;color:#ff2b88;background:#fff9;padding:1px 4px}
 </style>
-""" % CJK_STACK
+"""
 
+# 缩略框跟着画布比例走，缩放比也一起算——写死 16:9 会把非 16:9 模板的页面裁掉一截
 INDEX_EXTRA = """<style>
-.wrap{width:960px;margin:0 auto;padding:16px 0}
+.wrap{width:%dpx;margin:0 auto;padding:16px 0}
 .lbl{color:#eee;font:13px/1.6 monospace;margin:14px 0 4px}
-.box{width:960px;height:540px;overflow:hidden;margin-bottom:6px}
-.box .page{transform:scale(.5);transform-origin:top left}
+.box{width:%dpx;height:%dpx;overflow:hidden;margin-bottom:6px}
+.box .page{transform:scale(%g);transform-origin:top left}
 </style>
 """
 
@@ -508,7 +509,8 @@ def render_pages_png(pages, outdir, data, scale=0.5):
                    for m in data.get('media') or [] if m.get('exported') and m.get('out')}
     png_dir = os.path.join(outdir, 'ref', 'rebuild', 'png')
     os.makedirs(png_dir, exist_ok=True)
-    W, H = int(1920 * scale), int(1080 * scale)
+    cpx = ((data.get('canvas') or {}).get('px') or [1920, 1080])
+    W, H = int(cpx[0] * scale), int(cpx[1] * scale)
     for kind, n, label, layers, default_color, page_bg in pages:
         canvas = Image.new('RGBA', (W, H), _rgba(page_bg) or (136, 136, 136, 255))
         g = _grad_stops(page_bg or '')
@@ -642,15 +644,19 @@ def main():
                           tx1_of_master.get(master, '#000000'),
                           layout_bg.get(part, '#888')))
 
-    if only is not None:
-        pages = [p for p in pages if p[0] != 'slide' or p[1] in only]
+    if only is not None:      # 对样张和版式一律生效（form=3 的代表页是版式，不是样张）
+        pages = [p for p in pages if p[1] in only]
 
     stats = {'shapes': 0, 'text': 0, 'img_ok': 0, 'img_missing': 0, 'no_box': 0}
-    index = [HEAD, INDEX_EXTRA, '<div class="wrap">']
+    cw, ch = ((data.get('canvas') or {}).get('px') or [1920, 1080])[:2]
+    head = HEAD % (CJK_STACK, cw, ch)   # 视口跟画布走，非 16:9 模板不能按 1920x1080 裁
+    thumb_scale = 960.0 / cw
+    index = [head, INDEX_EXTRA % (960, 960, round(ch * thumb_scale), thumb_scale),
+             '<div class="wrap">']
     for kind, n, label, layers, default_color, page_bg in (() if args.no_html else pages):
         html = page_html(layers, default_color, page_bg, media_url, stats)
         with open(os.path.join(rebuild, '%s-%d.html' % (kind, n)), 'w', encoding='utf-8') as f:
-            f.write(HEAD + html)
+            f.write(head + html)
         index += ['<div class="lbl">%s</div>' % esc(label),
                   '<div class="box">%s</div>' % html]
     index.append('</div>')

package/steering/design-html/skills/pptx-style-extract/scripts/test_background_composite.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+"""Focused regression tests for deterministic picture compositing."""
+import io
+import os
+import sys
+import unittest
+
+from PIL import Image
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from extract import _draw_picture  # noqa: E402
+
+
+class _Archive:
+    def __init__(self, media, raw):
+        self.names = {media}
+        self.zip = self
+        self.raw = raw
+
+    def read(self, media):
+        if media not in self.names:
+            raise KeyError(media)
+        return self.raw
+
+
+def _png(pixels):
+    image = Image.new('RGBA', (len(pixels), 1))
+    image.putdata(pixels)
+    output = io.BytesIO()
+    image.save(output, 'PNG')
+    return output.getvalue()
+
+
+class BackgroundCompositeTest(unittest.TestCase):
+    def test_applies_flip_and_opacity_once(self):
+        media = 'ppt/media/source.png'
+        package = _Archive(media, _png([(255, 0, 0, 255), (0, 0, 255, 255)]))
+        canvas = Image.new('RGBA', (2, 1), (255, 255, 255, 255))
+
+        drawn = _draw_picture(canvas, {
+            'media': media,
+            'box_unrotated': {'x': 0, 'y': 0, 'w': 2, 'h': 1},
+            'flipH': True,
+            'opacity': 0.5,
+        }, package)
+
+        self.assertTrue(drawn)
+        left, right = canvas.getpixel((0, 0)), canvas.getpixel((1, 0))
+        self.assertEqual(left[:3], (128, 128, 255))
+        self.assertEqual(right[:3], (255, 128, 128))
+        self.assertEqual(left[3], 255)
+        self.assertEqual(right[3], 255)
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_color_contract.py

@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+"""Regression test for the generated consumer-facing color contract."""
+import os
+import tempfile
+import unittest
+
+from draft import emit_body
+
+
+class ColorContractTest(unittest.TestCase):
+    def test_body_allows_supporting_colors_without_a_second_accent_system(self):
+        data = {
+            'canvas': {'px': [1920, 1080]},
+            'counts': {'slides': 1},
+            'form_hint': {'form': 3},
+        }
+        tokens = [
+            ('primary', {'hex': '#123456'}),
+            ('surface', {'hex': '#FFFFFF'}),
+        ]
+        fonts = [
+            {
+                'names': ['Example Sans'],
+                'stack': ['Example Sans', 'Noto Sans SC'],
+            },
+        ]
+        roles = {'body': {'sz_px': 36}}
+        archetypes = [
+            {
+                'name': 'content',
+                'slots': [],
+            },
+        ]
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_body(
+                data,
+                tokens,
+                fonts,
+                roles,
+                [],
+                archetypes,
+                [],
+                {},
+                output_dir,
+            )
+            with open(os.path.join(output_dir, 'body.md'), encoding='utf-8') as stream:
+                body = stream.read()
+
+        self.assertIn('允许新增中性色、低彩度辅助色或局部语义色', body)
+        self.assertRegex(body, r'正负.*风险.*警告.*状态.*图表序列')
+        self.assertIn('不得自行新增第二强调色', body)
+        self.assertIn('高饱和、高对比、大面积或跨页重复', body)
+        self.assertIn('标题、关键数字、图表主序列、卡片底色或渐变', body)
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_design_consumer_contract.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+"""Regression tests for consumer rules emitted into design.md."""
+import os
+import tempfile
+import unittest
+
+from draft import emit_body
+
+
+class DesignConsumerContractTest(unittest.TestCase):
+    def test_generated_design_owns_template_consumption_rules(self):
+        data = {
+            'canvas': {'px': [1920, 1080]},
+            'counts': {'slides': 1},
+            'form_hint': {'form': 3},
+        }
+        tokens = [('primary', {'hex': '#123456'})]
+        fonts = [
+            {
+                'names': ['Example Sans'],
+                'stack': ['Example Sans', 'Noto Sans SC'],
+            },
+        ]
+        roles = {'body': {'sz_px': 36}}
+        assets = [
+            {
+                'id': 'bg-content',
+                'kind': 'background',
+                'role': 'content',
+            },
+        ]
+        archetypes = [{'name': 'content', 'slots': []}]
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_body(
+                data,
+                tokens,
+                fonts,
+                roles,
+                assets,
+                archetypes,
+                [],
+                {},
+                output_dir,
+            )
+            with open(os.path.join(output_dir, 'body.md'), encoding='utf-8') as stream:
+                body = stream.read()
+
+        self.assertIn('是全局 token', body)
+        self.assertIn('局部 slot / decor 的 `css` 优先', body)
+        self.assertIn('字体使用 Typography 的完整栈与降级', body)
+        self.assertIn('将包内 `assets/` 复制到项目内相对目录', body)
+        self.assertIn('本机绝对路径', body)
+        self.assertIn('背景、资产和本段规则均来自本风格包', body)
+        self.assertIn('页面无资源加载失败、内容溢出或画幅裁切', body)
+        self.assertIn('沿用该页型已有的标题层级与局部 `css`', body)
+        self.assertIn('背景中已经可见的固定标题不再创建文本', body)
+        self.assertIn('没有 `subtitle` 槽就不新增副标题', body)
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_layout_css.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+"""Regression tests for the consumer-facing layout slot CSS contract."""
+import os
+import sys
+import tempfile
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from check_v2 import Pack, rule_v2_16  # noqa: E402
+from draft import emit_layouts, slot_style  # noqa: E402
+from package import FONTSIZE_RE, build_layouts_md, split_top_blocks  # noqa: E402
+
+
+class LayoutCssTest(unittest.TestCase):
+    def test_text_slot_emits_rendering_style_as_css_only(self):
+        shape = {
+            'text': {
+                'bodyPr': {
+                    'anchor': 'ctr',
+                    'insets_px': {'lIns': 12, 'tIns': 8, 'rIns': 10, 'bIns': 6},
+                    'rot': '900000',
+                },
+                'lstStyle': {
+                    'lvl1pPr': {
+                        'sz_px': 48,
+                        'weight': 600,
+                        'italic': True,
+                        'underline': 'sng',
+                        'strike': 'sngStrike',
+                        'spc_px': 1.5,
+                        'color': {'resolved': '#123456'},
+                        'algn': 'ctr',
+                        'lnSpc': {'mult': 1.0},
+                    },
+                },
+                'paragraphs': [],
+            },
+        }
+        slot = {
+            'role': 'title',
+            'type': 'title',
+            'box': [100, 80, 800, 160],
+            'sz': 48,
+            'txt': '标题',
+        }
+        slot.update(slot_style(shape))
+        archetype = {
+            'name': 'layout-1',
+            'zh': '标题页',
+            'role': 'content',
+            'bg': None,
+            'slots': [slot],
+            'decor': [],
+            'pages': [1],
+            'rep': 1,
+            'pic_n': 0,
+            'confidence': 'high',
+        }
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_layouts([archetype], output_dir)
+            with open(os.path.join(output_dir, 'layouts.yaml'), encoding='utf-8') as stream:
+                layouts_yaml = stream.read()
+            layouts_md = build_layouts_md(split_top_blocks(layouts_yaml), (1920, 1080))
+
+        self.assertIn(
+            'css: "box-sizing: border-box; padding: 8px 10px 6px 12px; '
+            'font-size: 48px; font-weight: 600; font-style: italic; '
+            'text-decoration: underline line-through; letter-spacing: 1.5px; color: #123456; '
+            'text-align: center; line-height: 1.2; display: flex; '
+            'flex-direction: column; justify-content: center; rotate: 15deg"',
+            layouts_md,
+        )
+        for legacy_key in ('size', 'weight', 'color', 'align', 'valign', 'insets_px'):
+            self.assertNotRegex(layouts_md, rf'[,{{]\s*{legacy_key}:')
+        self.assertEqual(FONTSIZE_RE.findall(layouts_md), ['48'])
+
+    def test_layout_gate_rejects_legacy_slot_style_keys(self):
+        with tempfile.TemporaryDirectory() as pack_dir:
+            with open(os.path.join(pack_dir, 'design.md'), 'w', encoding='utf-8') as stream:
+                stream.write('---\nversion: alpha\nlayouts: layouts.md\n---\n\nRead layouts.md.\n')
+            with open(os.path.join(pack_dir, 'layouts.md'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    '---\ncanvas: 1920x1080\nlayouts:\n  cover:\n    role: cover\n'
+                    '    slots:\n      - {role: title, type: title, box: [0, 0, 800, 100], '
+                    'size: 48, align: center}\n    confidence: high\n---\n'
+                )
+
+            result = rule_v2_16(Pack(pack_dir))
+
+        self.assertEqual(result.level, 'FAIL')
+        self.assertEqual(len(result.fails), 1)
+        self.assertIn('旧样式键 align/size', result.fails[0])
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_rounded_contract.py

@@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+"""Regression tests for preserving per-container radii."""
+import os
+import tempfile
+import unittest
+
+from draft import emit_body, emit_frontmatter
+from query import _recipe_css
+
+
+def render_frontmatter(radii):
+    data = {
+        'radii_census': radii,
+        'spacing_candidates': {},
+    }
+    tokens = [('surface', {'hex': '#FFFFFF'})]
+
+    with tempfile.TemporaryDirectory() as output_dir:
+        emit_frontmatter(
+            data,
+            tokens,
+            [],
+            {},
+            [],
+            [],
+            output_dir,
+        )
+        with open(os.path.join(output_dir, 'frontmatter.yaml'), encoding='utf-8') as stream:
+            return stream.read()
+
+
+def render_body():
+    data = {
+        'canvas': {'px': [1920, 1080]},
+        'form_hint': {'form': 2},
+        'counts': {'slides': 1},
+    }
+
+    with tempfile.TemporaryDirectory() as output_dir:
+        emit_body(
+            data,
+            [],
+            [],
+            {},
+            [],
+            [],
+            [],
+            {},
+            output_dir,
+        )
+        with open(os.path.join(output_dir, 'body.md'), encoding='utf-8') as stream:
+            return stream.read()
+
+
+class RoundedContractTest(unittest.TestCase):
+    def test_multiple_radius_tiers_are_not_collapsed_into_one_card_token(self):
+        frontmatter = render_frontmatter(
+            [
+                {'px': 6.9, 'n': 2},
+                {'px': 11.9, 'n': 2},
+                {'px': 14.4, 'n': 3},
+            ]
+        )
+
+        self.assertNotIn('rounded:', frontmatter)
+
+    def test_single_radius_tier_can_remain_a_global_token(self):
+        frontmatter = render_frontmatter([{'px': 12, 'n': 9}])
+
+        self.assertIn('rounded:\n  card: 12px', frontmatter)
+
+    def test_rare_rounded_exceptions_do_not_override_a_zero_radius_majority(self):
+        frontmatter = render_frontmatter(
+            [
+                {'px': 0, 'n': 241},
+                {'px': 3.4, 'n': 4},
+                {'px': 6.9, 'n': 3},
+                {'px': 50.5, 'n': 1},
+            ]
+        )
+
+        self.assertNotIn('rounded:', frontmatter)
+
+    def test_generated_usage_defaults_unspecified_container_radius_to_zero(self):
+        body = render_body()
+
+        self.assertIn('没有 `border-radius` 就按 `0`', body)
+        self.assertIn('不得自行补圆角', body)
+
+    def test_recipe_does_not_promote_one_rounded_exception_to_the_whole_group(self):
+        css = _recipe_css(
+            {'type': 'solid', 'color': {'hex': '#FFFFFF'}},
+            None,
+            [0] * 70 + [50.5],
+            None,
+        )
+
+        self.assertFalse(any('border-radius' in declaration for declaration in css))
+
+    def test_recipe_keeps_a_radius_shared_by_the_whole_group(self):
+        css = _recipe_css(
+            {'type': 'solid', 'color': {'hex': '#FFFFFF'}},
+            None,
+            [6.9] * 17,
+            None,
+        )
+
+        self.assertIn('border-radius: 6.9px', css)
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_text_role_contract.py

@@ -0,0 +1,168 @@
+#!/usr/bin/env python3
+"""Regression tests for inherited layout text and model-decided text roles."""
+import json
+import os
+import sys
+import tempfile
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from draft import draft_layouts, emit_layouts, inherited_text_shapes
+from package import build_layouts_md, split_top_blocks
+
+
+def text_shape(part, layer, shape_id, box, text, placeholder):
+    return {
+        'part': part,
+        'layer': layer,
+        'id': shape_id,
+        'kind': 'sp',
+        'name': 'Text Placeholder',
+        'ph': placeholder,
+        'box': box,
+        'text': {
+            'bodyPr': {},
+            'lstStyle': {
+                'lvl1pPr': {
+                    'sz_px': 48,
+                    'weight': 600,
+                    'color': {'resolved': '#C41230'},
+                },
+            },
+            'paragraphs': [
+                {
+                    'runs': [{'text': text}],
+                },
+            ] if text else [],
+        },
+    }
+
+
+class TextRoleContractTest(unittest.TestCase):
+    def test_empty_non_placeholder_layout_shape_is_not_a_text_slot(self):
+        layout_part = 'ppt/slideLayouts/slideLayout2.xml'
+        decorative_shape = text_shape(
+            layout_part,
+            'layout',
+            '9',
+            {'x': 0, 'y': 0, 'w': 1920, 'h': 24},
+            '',
+            None,
+        )
+        decorative_shape['name'] = 'Decorative bar'
+
+        self.assertEqual(inherited_text_shapes([decorative_shape], []), [])
+
+    def test_empty_slide_inherits_text_slot_and_css_from_its_layout(self):
+        layout_part = 'ppt/slideLayouts/slideLayout2.xml'
+        slide_part = 'ppt/slides/slide1.xml'
+        shapes = [
+            text_shape(
+                layout_part,
+                'layout',
+                '10',
+                {'x': 120, 'y': 80, 'w': 840, 'h': 120},
+                'Example heading',
+                {'type': 'body', 'idx': '10'},
+            ),
+            text_shape(
+                slide_part,
+                'slide',
+                '2',
+                None,
+                '',
+                {'type': 'body', 'idx': '10'},
+            ),
+        ]
+        data = {
+            'canvas': {'px': [1920, 1080]},
+            'form_hint': {'form': 0},
+            'slides': [
+                {
+                    'part': slide_part,
+                    'layout': layout_part,
+                    'background': None,
+                },
+            ],
+            'background_composites': {},
+        }
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            os.makedirs(os.path.join(output_dir, 'ref'))
+            with open(
+                os.path.join(output_dir, 'ref', 'shapes.json'),
+                'w',
+                encoding='utf-8',
+            ) as stream:
+                json.dump({'shapes': shapes}, stream)
+            archetypes, _, _ = draft_layouts(data, output_dir)
+
+        self.assertEqual(len(archetypes), 1)
+        self.assertEqual(len(archetypes[0]['slots']), 1)
+        slot = archetypes[0]['slots'][0]
+        self.assertEqual(slot['box'], [120, 80, 840, 120])
+        self.assertEqual(slot['txt'], 'Example heading')
+        self.assertEqual(slot['role'], 'body')
+        self.assertEqual(slot['type'], 'body')
+        self.assertTrue(slot['_needs_role'])
+        self.assertIn('font-size: 48px', slot['css'])
+        self.assertIn('font-weight: 600', slot['css'])
+        self.assertIn('color: #C41230', slot['css'])
+
+    def test_text_role_judgement_changes_semantics_without_dropping_slot(self):
+        archetype = {
+            'name': 'layout-1',
+            'zh': None,
+            'role': 'content',
+            'bg': None,
+            'slots': [
+                {
+                    'role': 'body',
+                    'type': 'body',
+                    'box': [120, 80, 840, 120],
+                    'sz': 48,
+                    'txt': 'Example heading',
+                    'css': 'font-size: 48px; color: #C41230',
+                    '_needs_role': True,
+                    '_source_layer': 'layout',
+                    '_placeholder': 'body/10',
+                },
+            ],
+            'decor': [],
+            'pages': [1],
+            'rep': 1,
+            'pic_n': 0,
+            'confidence': 'low',
+        }
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_layouts([archetype], output_dir)
+            path = os.path.join(output_dir, 'layouts.yaml')
+            with open(path, encoding='utf-8') as stream:
+                draft = stream.read()
+
+        self.assertIn('text_roles:', draft)
+        self.assertIn(
+            'layout-1-text-1: TODO文本角色',
+            draft,
+        )
+        self.assertEqual(draft.count('box: [120, 80, 840, 120]'), 1)
+
+        decided = draft.replace(
+            'layout-1-text-1: TODO文本角色',
+            'layout-1-text-1: title',
+        )
+        layouts_md = build_layouts_md(split_top_blocks(decided), (1920, 1080))
+
+        self.assertNotIn('text_roles:', layouts_md)
+        self.assertEqual(layouts_md.count('box: [120, 80, 840, 120]'), 1)
+        self.assertIn(
+            'role: title, box: [120, 80, 840, 120], type: title',
+            layouts_md,
+        )
+        self.assertIn('css: "font-size: 48px; color: #C41230"', layouts_md)
+
+
+if __name__ == '__main__':
+    unittest.main()