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

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

@@ -39,15 +39,15 @@ class Package:
         self.masters = sorted((n for n in self.names if MASTER_RE.match(n)), key=_num)
         self.themes, self.theme_discovery = self._find_themes(ct)
         # zip directory entries ('ppt/media/') must not be counted as assets —
-        # 票 03 recon counted one, which is why its media totals run one high.
+        # they inflate media totals by one.
         self.media = sorted(n for n in self.names
                             if n.startswith('ppt/media/') and not n.endswith('/'))
 
     def _find_themes(self, ct):
         """Theme parts come from [Content_Types].xml, not from a path pattern.
 
-        Compressors relocate them — 飞书压缩版 puts them at
-        ppt/slideMasters/theme/themeN.xml — and a `ppt/theme/` regex then finds
+        Compressors relocate them — some rewrite them under
+        ppt/slideMasters/theme/ — and a `ppt/theme/` regex then finds
         nothing to bind the masters to, so every schemeClr resolves to
         UNRESOLVED:no-scheme. The path regex stays as the fallback for packages
         whose content types are unreadable.
@@ -393,6 +393,9 @@ def walk_tree(el, ctx, out, path=(), xf=(1.0, 1.0, 0.0, 0.0), depth=0):
             blip = sp.find('p:blipFill/a:blip', NS)
             if blip is not None:
                 rec['media'] = ctx.media_of(blip.get(R_EMBED)) or ctx.media_of(blip.get(R_LINK))
+                alpha = blip.find('a:alphaModFix', NS)
+                if alpha is not None and alpha.get('amt') is not None:
+                    rec['opacity'] = round(int(alpha.get('amt')) / 100000.0, 6)
                 svg = blip.find('a:extLst//asvg:svgBlip', NS)
                 if svg is not None:
                     rec['media_svg'] = ctx.media_of(svg.get(R_EMBED))

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_asset_judgment_package.py

@@ -0,0 +1,161 @@
+#!/usr/bin/env python3
+"""Integration regression tests for model-decided image roles."""
+import json
+import os
+import sys
+import tempfile
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from check_v2 import Pack, RULES  # noqa: E402
+from package import main as package_main  # noqa: E402
+
+
+class AssetJudgmentPackageTest(unittest.TestCase):
+    def test_package_strips_judgment_fields_and_preserves_content_slot(self):
+        try:
+            from PIL import Image
+        except ImportError:
+            self.skipTest('Pillow unavailable')
+
+        with tempfile.TemporaryDirectory() as root:
+            stage1 = os.path.join(root, 'stage1')
+            lout = os.path.join(stage1, 'l-out')
+            pack = os.path.join(root, 'pack')
+            media = os.path.join(stage1, 'media-out')
+            ref = os.path.join(stage1, 'ref')
+            os.makedirs(lout)
+            os.makedirs(media)
+            os.makedirs(ref)
+
+            Image.new('RGBA', (40, 20), (20, 40, 60, 255)).save(
+                os.path.join(media, 'partner-logo.png'))
+            Image.new('RGBA', (24, 24), (60, 40, 20, 255)).save(
+                os.path.join(media, 'ornament.png'))
+
+            box_rows = [
+                ('ppt/media/image1.png', 'partner-logo.png', [100, 200, 400, 200]),
+                ('ppt/media/image2.png', 'ornament.png', [40, 40, 120, 120]),
+            ]
+            extract = {
+                'source': {'filename': 'fixture.pptx'},
+                'canvas': {
+                    'px': [1920, 1080],
+                    'source': {'cx': 12192000, 'cy': 6858000, 'unit': 'EMU'},
+                },
+                'media': [
+                    {
+                        'media': source,
+                        'out': 'media-out/' + output,
+                        'source_px': [40, 20] if output == 'partner-logo.png' else [24, 24],
+                    }
+                    for source, output, _ in box_rows
+                ],
+                'images': [
+                    {
+                        'media': source,
+                        'boxes': [{
+                            'count': 1,
+                            'box': {'x': box[0], 'y': box[1], 'w': box[2], 'h': box[3]},
+                            'parts': ['ppt/slides/slide1.xml'],
+                        }],
+                    }
+                    for source, _, box in box_rows
+                ],
+                'color_freq': [],
+                'text_scale': [],
+            }
+            with open(os.path.join(stage1, 'extract.json'), 'w', encoding='utf-8') as stream:
+                json.dump(extract, stream)
+            with open(os.path.join(ref, 'shapes.json'), 'w', encoding='utf-8') as stream:
+                json.dump({
+                    'shapes': [
+                        {
+                            'part': 'ppt/slides/slide1.xml',
+                            'kind': 'pic',
+                            'name': output,
+                            'box': {'x': box[0], 'y': box[1], 'w': box[2], 'h': box[3]},
+                        }
+                        for _, output, box in box_rows
+                    ],
+                }, stream)
+
+            with open(os.path.join(lout, 'manifest.yaml'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    'version: alpha\n'
+                    'name: asset-judgment-fixture\n'
+                    'description: >\n'
+                    '  A restrained fixture with explicit image-role judgments and traced layout slots.\n'
+                    'assets:\n'
+                    '  - id: logo-primary\n'
+                    '    source_media: partner-logo.png\n'
+                    '    kind: logo\n'
+                    '    on-bg: light\n'
+                    'asset_decisions:\n'
+                    '  - source_media: partner-logo.png\n'
+                    '    decision: content\n'
+                    '  - source_media: ornament.png\n'
+                    '    decision: texture\n'
+                )
+            with open(os.path.join(lout, 'frontmatter.yaml'), 'w', encoding='utf-8') as stream:
+                stream.write('')
+            with open(os.path.join(lout, 'layouts.yaml'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    'layouts:\n'
+                    '  content:\n'
+                    '    name: "内容页"\n'
+                    '    role: content\n'
+                    '    slots:\n'
+                    '      - {role: logo, box: [100, 200, 400, 200], type: pic, '
+                    'asset: logo-primary, source_media: partner-logo.png}\n'
+                    '      - {role: asset-candidate, box: [40, 40, 120, 120], type: pic, '
+                    'source_media: ornament.png}\n'
+                    '    confidence: high\n'
+                )
+            with open(os.path.join(lout, 'body.md'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    '## Usage\n\n'
+                    'Read `layouts.md` before composing a slide.\n\n'
+                    '## Assets\n\n'
+                    '{{ASSET_TABLE}}\n\n'
+                    '## Hard Rules\n\n'
+                    '{{LOGO_RULES}}\n'
+                )
+            check_v1 = os.path.join(root, 'check_v1.py')
+            with open(check_v1, 'w', encoding='utf-8') as stream:
+                stream.write('raise SystemExit(0)\n')
+
+            rc = package_main([stage1, lout, pack, '--check-v1', check_v1])
+
+            self.assertEqual(rc, 0)
+            with open(os.path.join(pack, 'design.md'), encoding='utf-8') as stream:
+                design = stream.read()
+            with open(os.path.join(pack, 'layouts.md'), encoding='utf-8') as stream:
+                layouts = stream.read()
+            self.assertNotIn('asset_decisions', design)
+            self.assertNotIn('source_media', design)
+            self.assertNotIn('source_media', layouts)
+            self.assertNotIn('{{LOGO_RULES}}', design)
+            self.assertNotIn('logo-primary', design)
+            self.assertNotIn('logo-primary', layouts)
+            self.assertIn(
+                '- {role: pic, box: [100, 200, 400, 200], type: pic}',
+                layouts,
+            )
+            self.assertIn('texture-1:', design)
+            self.assertIn('kind: texture', design)
+            self.assertIn(
+                '- {role: texture, box: [40, 40, 120, 120], type: pic, asset: texture-1}',
+                layouts,
+            )
+            gate = Pack(pack)
+            self.assertFalse([
+                result
+                for result in (rule(gate) for rule in RULES)
+                if result.fails
+            ])
+
+
+if __name__ == '__main__':
+    unittest.main()

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,60 @@
+#!/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('必要时可以使用 Colors 之外的颜色', body)
+        self.assertIn('不能形成与模板主色竞争的第二强调色', body)
+        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,63 @@
+#!/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)
+        self.assertIn('区带自带 `margin: [左, 右]` 时用它的', body)
+
+
+if __name__ == '__main__':
+    unittest.main()