@lark-apaas/coding-steering 0.1.32-dev.5abff3b → 0.1.32-dev.942e73f

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

@@ -438,6 +438,119 @@ class AssetJudgmentPackageTest(unittest.TestCase):
                 if result.fails
             ])
 
+    def test_package_places_a_rendered_picture_instance_as_a_logo_asset(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)
+
+            source = 'generated/instance/picture-directory-logo.webp'
+            output = 'picture-directory-logo.webp'
+            box = [1813, 18, 59, 228]
+            Image.new('RGBA', (59, 228), (20, 60, 100, 255)).save(
+                os.path.join(media, output), 'WEBP')
+            extract = {
+                'source': {'filename': 'fixture.pptx'},
+                'canvas': {
+                    'px': [1920, 1080],
+                    'source': {'cx': 12192000, 'cy': 6858000, 'unit': 'EMU'},
+                },
+                'media': [{
+                    'media': source,
+                    'out': 'media-out/' + output,
+                    'generated': True,
+                    'rendered_from': 'ppt/media/original-logo.png',
+                }],
+                'images': [{
+                    'media': source,
+                    'boxes': [{
+                        'count': 1,
+                        'box': dict(zip(('x', 'y', 'w', 'h'), box)),
+                        'parts': ['ppt/slides/slide2.xml'],
+                    }],
+                }],
+                '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/slide2.xml',
+                    'kind': 'pic',
+                    'box': dict(zip(('x', 'y', 'w', 'h'), box)),
+                }]}, stream)
+            with open(os.path.join(lout, 'asset-vision-groups.json'),
+                      'w', encoding='utf-8') as stream:
+                json.dump({
+                    'version': 2,
+                    'selected': [{
+                        'candidates': [{
+                            'id': 'asset-directory-logo',
+                            'source_media': output,
+                            'placements': [{
+                                'slide': 2,
+                                'archetype': 'content',
+                                'box': box,
+                            }],
+                        }],
+                    }],
+                    'omitted': [],
+                }, stream)
+            with open(os.path.join(lout, 'manifest.yaml'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    'version: alpha\n'
+                    'name: rendered-instance-fixture\n'
+                    'description: Rendered local PPT image instances remain reusable assets.\n'
+                    'asset_vision_groups:\n'
+                    '  - id: asset-directory-logo\n'
+                    '    source_media: picture-directory-logo.webp\n'
+                    '    box: [1813, 18, 59, 228]\n'
+                    '    visual_kind: logo\n'
+                )
+            for name, content in (
+                ('frontmatter.yaml', ''),
+                ('body.md', 'Read `layouts.md` before composing a slide.\n\n{{ASSET_TABLE}}\n'),
+                ('layouts.yaml',
+                 'layouts:\n'
+                 '  content:\n'
+                 '    name: "目录"\n'
+                 '    role: content\n'
+                 '    slots:\n'
+                 '      - {role: asset-candidate, box: [1813, 18, 59, 228], type: pic, '
+                 'source_media: picture-directory-logo.webp}\n'
+                 '    confidence: high\n'),
+            ):
+                with open(os.path.join(lout, name), 'w', encoding='utf-8') as stream:
+                    stream.write(content)
+            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')
+
+            self.assertEqual(package_main([stage1, lout, pack, '--check-v1', check_v1]), 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.assertTrue(os.path.isfile(os.path.join(pack, 'assets', 'logos', '1.webp')))
+            self.assertIn('logo-1:', design)
+            self.assertIn('assets/logos/1.webp', design)
+            self.assertIn(
+                '- {role: logo, box: [1813, 18, 59, 228], type: pic, asset: logo-1}',
+                layouts,
+            )
+
 
 if __name__ == '__main__':
     unittest.main()

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

@@ -3,18 +3,33 @@
 import io
 import os
 import sys
+import tempfile
 import unittest
+from unittest import mock
+from xml.etree import ElementTree as ET
 
 from PIL import Image
 
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 
-from extract import _draw_picture  # noqa: E402
+import extract  # noqa: E402
+from extract import (  # noqa: E402
+    _draw_picture,
+    _is_full_canvas_fill_overlay,
+    compose_backgrounds,
+    export_media,
+    export_visible_picture_instances,
+)
+from census import image_census  # noqa: E402
+from ooxml import Units  # noqa: E402
+from parts import walk_tree  # noqa: E402
+from render_pages import background_css  # noqa: E402
 
 
 class _Archive:
     def __init__(self, media, raw):
         self.names = {media}
+        self.media = [media]
         self.zip = self
         self.raw = raw
 
@@ -23,6 +38,35 @@ class _Archive:
             raise KeyError(media)
         return self.raw
 
+    def size_of(self, media):
+        if media not in self.names:
+            raise KeyError(media)
+        return len(self.raw)
+
+
+class _CompositeArchive(_Archive):
+    def __init__(self, media, raw, slide):
+        super().__init__(media, raw)
+        self.layouts = []
+        self.slides = [slide]
+
+    @staticmethod
+    def xml(_part):
+        return {}
+
+
+class _ShapeContext:
+    def __init__(self, media):
+        self.part = 'ppt/slides/slide1.xml'
+        self.layer = 'slide'
+        self.units = Units(1920, 1080)
+        self.clrmap = {}
+        self.clrscheme = {}
+        self.media = media
+
+    def media_of(self, _relationship_id):
+        return self.media
+
 
 def _png(pixels):
     image = Image.new('RGBA', (len(pixels), 1))
@@ -52,6 +96,269 @@ class BackgroundCompositeTest(unittest.TestCase):
         self.assertEqual(left[3], 255)
         self.assertEqual(right[3], 255)
 
+    def test_exports_a_cropped_rotated_visible_instance_from_a_near_blank_source(self):
+        media = 'ppt/media/source.png'
+        source = Image.new('RGBA', (1000, 1000))
+        for x in range(460, 540):
+            for y in range(460, 540):
+                source.putpixel((x, y), (15, 80, 160, 255))
+        raw = io.BytesIO()
+        source.save(raw, 'PNG')
+        package = _Archive(media, raw.getvalue())
+        shape = {
+            'kind': 'pic',
+            'media': media,
+            'part': 'ppt/slides/slide2.xml',
+            'box_unrotated': {'x': 100, 'y': 200, 'w': 20, 'h': 100},
+            'box': {'x': 50, 'y': 240, 'w': 120, 'h': 20},
+            'crop': {'l': 40, 't': 40, 'r': 40, 'b': 40},
+            'rot': 90,
+        }
+
+        with tempfile.TemporaryDirectory() as outdir:
+            rows = export_visible_picture_instances(package, [shape], outdir, True)
+            self.assertEqual(len(rows), 1)
+            self.assertTrue(rows[0]['generated'])
+            self.assertEqual(rows[0]['rendered_from'], media)
+            self.assertTrue(shape['media'].startswith('generated/instance/'))
+
+            rendered = Image.open(os.path.join(outdir, rows[0]['out'])).convert('RGBA')
+            self.assertGreater(rendered.width, rendered.height)
+            self.assertGreater(sum(pixel[3] for pixel in rendered.getdata()) / rendered.width
+                               / rendered.height, 13)
+
+    def test_instance_webp_writer_removes_partial_output_after_a_save_error(self):
+        canvas = Image.new('RGBA', (1, 1), (15, 80, 160, 255))
+
+        with tempfile.TemporaryDirectory() as outdir:
+            path = os.path.join(outdir, 'instance.webp')
+            with mock.patch.object(Image.Image, 'save', side_effect=OSError('webp unavailable')):
+                reason = extract._save_picture_instance_webp(canvas, path)
+
+            self.assertEqual('pillow-error: OSError: webp unavailable', reason)
+            self.assertFalse(os.path.exists(path))
+            self.assertFalse(os.path.exists(path + '.tmp'))
+
+    def test_instance_webp_failure_keeps_the_source_media_and_records_the_reason(self):
+        media = 'ppt/media/source.png'
+        package = _Archive(media, _png([(15, 80, 160, 255)]))
+        shape = {
+            'kind': 'pic',
+            'media': media,
+            'part': 'ppt/slides/slide2.xml',
+            'layer': 'slide',
+            'box_unrotated': {'x': 0, 'y': 0, 'w': 100, 'h': 100},
+            'box': {'x': 0, 'y': 0, 'w': 100, 'h': 100},
+            'rot': 90,
+        }
+
+        with tempfile.TemporaryDirectory() as outdir:
+            blocked = {}
+            with mock.patch.object(
+                    extract, '_save_picture_instance_webp',
+                    return_value='pillow-error: OSError: webp unavailable'):
+                rows = export_visible_picture_instances(
+                    package, [shape], outdir, True, blocked)
+            images, _ = image_census([shape], [], Units(1920, 1080))
+            media_rows = export_media(package, images, outdir, True)
+
+        self.assertEqual([], rows)
+        self.assertEqual(media, shape['media'])
+        self.assertTrue(images[0]['visible_instance_blocked'])
+        self.assertTrue(media_rows[0]['candidate'])
+        self.assertIn('visible_instance_fallback', media_rows[0]['reasons'])
+        self.assertEqual({
+            media: {
+                'reason': 'pillow-error: OSError: webp unavailable',
+                'attempted_specs': 1,
+                'part_refs': ['ppt/slides/slide2.xml'],
+            },
+        }, blocked)
+
+    def test_alpha_modulations_combine_for_a_visible_instance(self):
+        media = 'ppt/media/source.png'
+        package = _Archive(media, _png([(20, 40, 60, 255)]))
+        picture_tree = ET.fromstring('''
+            <p:spTree xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
+                xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main"
+                xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+              <p:pic>
+                <p:nvPicPr><p:cNvPr id="1" name="half-alpha"/><p:cNvPicPr/><p:nvPr/></p:nvPicPr>
+                <p:blipFill>
+                  <a:blip r:embed="rId1">
+                    <a:alphaMod amt="50000"/>
+                    <a:alphaModFix amt="50000"/>
+                  </a:blip>
+                  <a:stretch><a:fillRect/></a:stretch>
+                </p:blipFill>
+                <p:spPr>
+                  <a:xfrm><a:off x="0" y="0"/><a:ext cx="100" cy="100"/></a:xfrm>
+                  <a:prstGeom prst="rect"><a:avLst/></a:prstGeom>
+                </p:spPr>
+              </p:pic>
+            </p:spTree>
+        ''')
+        shapes = []
+        walk_tree(picture_tree, _ShapeContext(media), shapes)
+
+        self.assertEqual(shapes[0]['opacity'], 0.25)
+        with tempfile.TemporaryDirectory() as outdir:
+            rows = export_visible_picture_instances(package, shapes, outdir, True)
+            self.assertEqual(len(rows), 1)
+            rendered = Image.open(os.path.join(outdir, rows[0]['out'])).convert('RGBA')
+            self.assertAlmostEqual(rendered.getpixel((50, 50))[3], 64, delta=2)
+
+    def test_composites_full_canvas_gradient_and_solid_fill_overlays(self):
+        media = 'ppt/media/source.png'
+        slide = 'ppt/slides/slide1.xml'
+        package = _CompositeArchive(media, _png([(0, 0, 255, 255)]), slide)
+        picture = {
+            'part': slide,
+            'kind': 'pic',
+            'media': media,
+            'box_unrotated': {'x': 0, 'y': 0, 'w': 2, 'h': 1},
+            'w_pct': 100,
+            'h_pct': 100,
+        }
+        shape_base = {
+            'geom': {'prst': 'rect'},
+            'line': {'none': True},
+        }
+        gradient_overlay = {
+            **shape_base,
+            'part': slide,
+            'kind': 'sp',
+            'box_unrotated': {'x': 0, 'y': 0, 'w': 2, 'h': 1},
+            'w_pct': 100,
+            'h_pct': 100,
+            'fill': {
+                'type': 'gradient',
+                'stops': [
+                    {'pos': 0, 'color': {'resolved': 'rgba(255,0,0,0.5)'}},
+                    {'pos': 100, 'color': {'resolved': 'rgba(255,0,0,0.5)'}},
+                ],
+                'angle_deg': 0,
+            },
+        }
+        solid_overlay = {
+            **shape_base,
+            'part': slide,
+            'kind': 'sp',
+            'box_unrotated': {'x': 0, 'y': 0, 'w': 2, 'h': 1},
+            'w_pct': 100,
+            'h_pct': 100,
+            'fill': {
+                'type': 'solid',
+                'color': {'resolved': 'rgba(0,255,0,0.5)'},
+            },
+        }
+        text_overlay = dict(solid_overlay, text={
+            'paragraphs': [{'runs': [{'text': 'Do not flatten me'}]}],
+        })
+
+        self.assertTrue(_is_full_canvas_fill_overlay(gradient_overlay))
+        self.assertFalse(_is_full_canvas_fill_overlay(text_overlay))
+        self.assertFalse(_is_full_canvas_fill_overlay({
+            **gradient_overlay,
+            'fill': {**gradient_overlay['fill'], 'path': 'circle'},
+        }))
+        with tempfile.TemporaryDirectory() as outdir:
+            part_map, rows, _ = compose_backgrounds(
+                package,
+                {'layout_of_slide': {}, 'master_of_layout': {}},
+                [picture, gradient_overlay, solid_overlay, text_overlay],
+                {},
+                Units(2, 1),
+                outdir,
+                True,
+            )
+
+            self.assertEqual(set(part_map), {slide})
+            self.assertEqual(len(rows), 1)
+            self.assertEqual(
+                [layer['kind'] for layer in rows[0]['composited_from']],
+                ['picture', 'fill_overlay', 'fill_overlay'],
+            )
+            rendered = Image.open(os.path.join(outdir, rows[0]['out'])).convert('RGB')
+            red, green, blue = rendered.getpixel((0, 0))
+            self.assertGreater(red, 50)
+            self.assertGreater(green, 100)
+            self.assertGreater(blue, 50)
+
+    def test_preserves_fill_and_picture_draw_order(self):
+        media = 'ppt/media/source.png'
+        slide = 'ppt/slides/slide1.xml'
+        package = _CompositeArchive(media, _png([(0, 0, 255, 255)]), slide)
+        overlay = {
+            'part': slide,
+            'kind': 'sp',
+            'geom': {'prst': 'rect'},
+            'line': {'none': True},
+            'box_unrotated': {'x': 0, 'y': 0, 'w': 2, 'h': 1},
+            'w_pct': 100,
+            'h_pct': 100,
+            'fill': {'type': 'solid', 'color': {'resolved': 'rgba(255,0,0,0.5)'}},
+        }
+        picture = {
+            'part': slide,
+            'kind': 'pic',
+            'media': media,
+            'box_unrotated': {'x': 0, 'y': 0, 'w': 2, 'h': 1},
+            'w_pct': 100,
+            'h_pct': 100,
+        }
+
+        with tempfile.TemporaryDirectory() as outdir:
+            _, rows, _ = compose_backgrounds(
+                package,
+                {'layout_of_slide': {}, 'master_of_layout': {}},
+                [overlay, picture],
+                {},
+                Units(2, 1),
+                outdir,
+                True,
+            )
+
+            rendered = Image.open(os.path.join(outdir, rows[0]['out'])).convert('RGB')
+            self.assertEqual(rendered.getpixel((0, 0)), (0, 0, 255))
+
+    def test_path_gradient_background_is_not_linearized_for_compositing(self):
+        media = 'ppt/media/source.png'
+        slide = 'ppt/slides/slide1.xml'
+        package = _CompositeArchive(media, _png([(0, 0, 255, 255)]), slide)
+        picture = {
+            'part': slide,
+            'kind': 'pic',
+            'media': media,
+            'box_unrotated': {'x': 0, 'y': 0, 'w': 2, 'h': 1},
+            'w_pct': 100,
+            'h_pct': 100,
+            'rot': 90,
+        }
+        background = {
+            'type': 'gradient',
+            'path': 'circle',
+            'stops': [
+                {'pos': 0, 'color': {'resolved': '#FF0000'}},
+                {'pos': 100, 'color': {'resolved': '#00FF00'}},
+            ],
+        }
+
+        self.assertIsNone(background_css(background))
+        with tempfile.TemporaryDirectory() as outdir:
+            _, rows, _ = compose_backgrounds(
+                package,
+                {'layout_of_slide': {}, 'master_of_layout': {}},
+                [picture],
+                {slide: background},
+                Units(2, 1),
+                outdir,
+                True,
+            )
+
+            rendered = Image.open(os.path.join(outdir, rows[0]['out'])).convert('RGB')
+            self.assertEqual(rendered.getpixel((0, 0)), (0, 0, 255))
+
 
 if __name__ == '__main__':
     unittest.main()

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

@@ -57,6 +57,11 @@ class DesignConsumerContractTest(unittest.TestCase):
         self.assertIn('背景中已经可见的固定标题不再创建文本', body)
         self.assertIn('没有 `subtitle` 槽就不新增副标题', body)
         self.assertIn('区带自带 `margin: [左, 右]` 时用它的', body)
+        self.assertIn('必须完整阅读本 `design.md` 和 `layouts.md`', body)
+        self.assertIn('确认全部页型后再开始搭页', body)
+        self.assertIn('不能只看摘要、前几个页型', body)
+        self.assertIn('data-pptx-layout="<页型名>"', body)
+        self.assertIn('交付前据此核验 logo 只出现在该页型的资产槽中', body)
 
 
 if __name__ == '__main__':

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

@@ -1087,6 +1087,104 @@ layouts:
         self.assertIn('avoid: TODO禁放区列表', background_block)
         self.assertIn('pairing_rule: "TODO', background_block)
 
+    def test_background_controls_only_edit_existing_image_backgrounds(self):
+        archetype = {
+            'name': 'content',
+            'zh': '内容页',
+            'role': 'content',
+            'pages': [1],
+            'rep': 1,
+            'bg': 'bg-content',
+            'slots': [],
+            'decor': [],
+            'pic_n': 0,
+            'confidence': 'high',
+        }
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_layouts([archetype], output_dir)
+            with open(os.path.join(output_dir, 'layout-controls.yaml'),
+                      encoding='utf-8') as stream:
+                controls = stream.read()
+
+        self.assertIn('只编辑本草案已列出的真实图片背景', controls)
+        self.assertIn('纯色、渐变、外框、几何装饰和透明叠层不新建 bg_rules', controls)
+        self.assertIn('bg-content:', controls)
+
+    def test_template_layout_keeps_inherited_linear_gradient_background_as_decor(self):
+        layout_part = 'ppt/slideLayouts/slideLayout1.xml'
+        data = {
+            'canvas': {'px': [1920, 1080]},
+            'form_hint': {'form': 3},
+            'layouts': [{
+                'part': layout_part,
+                'name': '内容',
+                'used_by_slides': 1,
+                'background': {
+                    'type': 'gradient',
+                    'stops': [
+                        {'pos': 0, 'color': {'resolved': '#4B5CF5'}},
+                        {'pos': 100, 'color': {'resolved': '#233AFB'}},
+                    ],
+                    'angle_deg': 0,
+                },
+            }, {
+                'part': 'ppt/slideLayouts/slideLayout2.xml',
+                'name': '目录',
+                'used_by_slides': 0,
+            }, {
+                'part': 'ppt/slideLayouts/slideLayout3.xml',
+                'name': '封底',
+                'used_by_slides': 0,
+            }],
+            'slides': [{
+                'part': 'ppt/slides/slide1.xml',
+                'layout': layout_part,
+                'background': None,
+            }],
+            'images': [],
+            'media': [],
+            'theme_topology': {'themes': ['single'], 'per_master': [], 'default': 'single'},
+            'reference_graph': {
+                'master_of_layout': {},
+                'layout_of_slide': {'ppt/slides/slide1.xml': layout_part},
+            },
+            'background_composites': {},
+        }
+        shapes = []
+        for index, part in enumerate((layout_part,
+                                      'ppt/slideLayouts/slideLayout2.xml',
+                                      'ppt/slideLayouts/slideLayout3.xml'), 1):
+            shapes.append({
+                'part': part,
+                'layer': 'layout',
+                'kind': 'sp',
+                'box': {'x': 100, 'y': 100, 'w': 600, 'h': 100},
+                'ph': {'type': 'title', 'idx': str(index)},
+                'text': {'paragraphs': [{'runs': [{'text': 'Title %d' % index,
+                                                    'sz_px': 40}]}]},
+            })
+
+        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:
+                import json
+                json.dump({'shapes': shapes}, stream)
+            archetypes, _, _ = draft_layouts(data, output_dir)
+            emit_layouts(archetypes, output_dir)
+            emit_manifest(data, [], [], output_dir, archetypes)
+            with open(os.path.join(output_dir, 'layouts.yaml'), encoding='utf-8') as stream:
+                layouts_yaml = stream.read()
+            with open(os.path.join(output_dir, 'manifest.yaml'), encoding='utf-8') as stream:
+                manifest = stream.read()
+
+        self.assertIn('box: [0, 0, 1920, 1080]', layouts_yaml)
+        self.assertIn('background-image: linear-gradient(90deg, #4B5CF5 0%, #233AFB 100%)',
+                      layouts_yaml)
+        self.assertIn('value: "[0, 0, 1920, 1080]"', manifest)
+        self.assertIn('reason: "PPT 背景铺满画布"', manifest)
+
     def test_asset_vision_groups_fail_when_page_screenshot_is_unreadable(self):
         candidates = [{
             'id': 'asset-1',
@@ -1221,6 +1319,10 @@ layouts:
             'fullscreen': True,
             'probe': {'alpha_mean': 5, 'near_blank': True},
         }))
+        self.assertTrue(needs_asset_judgment({
+            'fullscreen': False,
+            'probe': {'alpha_mean': 5, 'near_blank': True},
+        }))
 
     def test_shape_fill_images_are_exposed_as_slide_marks(self):
         data = {