entari-plugin-hyw 3.5.0rc3__py3-none-any.whl → 3.5.0rc4__py3-none-any.whl

entari_plugin_hyw/card-ui/src/App.vue

@@ -126,9 +126,11 @@ const headerTextColor = computed(() => {
 const themeStyle = computed(() => ({ 
   '--theme-color': themeColor.value,
   '--header-text-color': headerTextColor.value,
-  '--text-muted': '#4b5563',      // gray-600, higher contrast for mobile
-  '--border-color': '#e5e7eb',    // gray-200, for borders
-  '--bg-subtle': '#f9fafb'        // gray-50, for subtle backgrounds
+  '--text-primary': '#2c2c2e',       // Warm dark gray for headings (Apple HIG inspired)
+  '--text-body': '#3a3a3c',          // Softer reading color for body text
+  '--text-muted': '#636366',         // Muted secondary text
+  '--border-color': '#e5e7eb',       // gray-200, for borders
+  '--bg-subtle': '#f9fafb'           // gray-50, for subtle backgrounds
 }))
 
 
@@ -328,14 +330,14 @@ java -Xmx1024M -Xms1024M -jar prism-launcher.jar
 </script>
 
 <template>
-  <div class="min-h-screen bg-[#f2f2f2] flex justify-center" :style="themeStyle">
+  <div class="bg-[#f2f2f2] flex justify-center" :style="themeStyle">
     <!-- Main container with explicit background for screenshot capture -->
-    <div id="main-container" class="w-[540px] pt-16 pb-28 space-y-8 !bg-[#f2f2f2]" data-theme="light">
+    <div id="main-container" class="w-[540px] pt-16 pb-12 space-y-8 !bg-[#f2f2f2]" data-theme="light">
       
       <!-- Title -->
       <header v-if="mainTitle" class="px-6 mb-8">
         <!-- Removed Time/Icon Badge as requested -->
-        <h1 class="text-4xl font-black text-gray-800 leading-tight tracking-tighter uppercase tabular-nums" v-html="processedTitle"></h1>
+        <h1 class="text-4xl font-black leading-tight tracking-tighter uppercase tabular-nums" style="color: var(--text-primary)" v-html="processedTitle"></h1>
       </header>
 
       <!-- Content Sections -->

entari_plugin_hyw/card-ui/src/components/MarkdownContent.vue

@@ -163,7 +163,7 @@ const processedHtml = computed(() => {
     return `
        <div class="my-8 group shadow-sm shadow-black/10">
         <div class="h-4 w-full" style="background-color: var(--theme-color);"></div>
-        <div class="p-6 text-[19px] leading-relaxed text-gray-700 font-medium bg-white">
+        <div class="p-6 text-[19px] leading-relaxed font-medium bg-white" style="color: var(--text-body)">
           ${content}
         </div>
       </div>
@@ -235,9 +235,9 @@ const processedHtml = computed(() => {
   })
   
   // Convert [N] citations to small square badges with shadow
-  html = html.replace(/\[(\d+)\]/g, (_, n) => {
+  html = html.replace(/(\s*)\[(\d+)\]/g, (_, _space, n) => {
     const num = parseInt(n)
-    return `<sup class="inline-flex items-center justify-center w-[15px] h-[15px] text-[10px] font-bold cursor-default select-none ml-1 align-middle" style="background-color: var(--theme-color); color: var(--header-text-color); box-shadow: 0 1px 2px 0 rgba(0,0,0,0.15)">${num}</sup>`
+    return `<sup class="inline-flex items-center justify-center w-[15px] h-[15px] text-[10px] font-bold cursor-default select-none ml-0.5 mr-0 align-middle" style="background-color: var(--theme-color); color: var(--header-text-color); box-shadow: 0 1px 2px 0 rgba(0,0,0,0.15)">${num}</sup>`
   })
   
   // Style <u> underline tags with theme-colored solid underline
@@ -252,15 +252,16 @@ const processedHtml = computed(() => {
 <template>
   <div ref="contentRef"
        class="prose prose-slate max-w-none prose-lg
-              prose-headings:text-gray-800 prose-headings:font-bold prose-headings:mb-3 prose-headings:mt-8 prose-headings:tracking-tight
-              prose-p:text-gray-800 prose-p:leading-7 prose-p:my-4 prose-p:text-[20px] prose-li:text-[20px] prose-li:text-gray-800
+              prose-headings:font-bold prose-headings:mb-3 prose-headings:mt-8 prose-headings:tracking-tight
+              prose-p:leading-7 prose-p:my-4 prose-p:text-[20px] prose-li:text-[20px]
               prose-a:text-blue-600 prose-a:no-underline hover:prose-a:underline
-              prose-code:bg-gray-100 prose-code:px-1.5 prose-code:py-0.5 prose-code:rounded-none prose-code:text-[0.85em] prose-code:font-mono prose-code:text-gray-800
+              prose-code:bg-gray-100 prose-code:px-1.5 prose-code:py-0.5 prose-code:rounded-none prose-code:text-[0.85em] prose-code:font-mono
               prose-pre:bg-gray-50 prose-pre:border prose-pre:border-gray-200 prose-pre:rounded-none prose-pre:p-0
               prose-img:rounded-none prose-img:my-6 prose-img:max-h-[400px] prose-img:w-auto prose-img:object-contain prose-img:border prose-img:border-gray-200
               prose-ol:list-decimal prose-ol:pl-7 prose-ol:list-outside prose-ol:my-5
               prose-li:my-2.5 prose-li:leading-7
               [&>*:first-child]:!mt-0"
+       style="--prose-headings: var(--text-primary); --prose-body: var(--text-body); --prose-bold: var(--text-primary); --prose-code: var(--text-body)"
        v-html="processedHtml">
   </div>
 </template>
@@ -326,7 +327,7 @@ const processedHtml = computed(() => {
   margin-left: 0 !important;
   position: relative !important;
   font-style: italic !important;
-  color: #1f2937 !important; /* gray-800 */
+  color: var(--text-body, #3a3a3c) !important; /* Premium reading color */
 }
 
 .prose blockquote::before {

entari_plugin_hyw/card-ui/src/components/StageCard.vue

@@ -1,14 +1,8 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { Icon } from '@iconify/vue'
 import type { Stage } from '../types'
 
-const failedImages = ref<Record<string, boolean>>({})
-
-function handleImageError(url: string) {
-  failedImages.value[url] = true
-}
-
 const props = defineProps<{
   stage: Stage
   isFirst?: boolean
@@ -17,6 +11,52 @@ const props = defineProps<{
   refOffset?: number
 }>()
 
+const failedImages = ref<Record<string, boolean>>({})
+const imageHeights = ref<Record<string, number>>({})
+
+function handleImageError(url: string) {
+  failedImages.value[url] = true
+}
+
+function handleImageLoad(url: string, event: Event) {
+  const img = event.target as HTMLImageElement
+  if (img.naturalWidth && img.naturalHeight) {
+    // Store aspect ratio as height per unit width
+    imageHeights.value[url] = img.naturalHeight / img.naturalWidth
+  }
+}
+
+// Compute two columns for masonry layout
+const imageColumns = computed(() => {
+  const images = props.stage.image_references || []
+  const leftColumn: typeof images = []
+  const rightColumn: typeof images = []
+  let leftHeight = 0
+  let rightHeight = 0
+
+  for (const img of images) {
+    if (failedImages.value[img.url]) continue
+    
+    // Get aspect ratio (default to 1 if not loaded yet)
+    const aspectRatio = imageHeights.value[img.url] || 1
+    
+    // Add to shorter column
+    if (leftHeight <= rightHeight) {
+      leftColumn.push(img)
+      leftHeight += aspectRatio
+    } else {
+      rightColumn.push(img)
+      rightHeight += aspectRatio
+    }
+  }
+
+  return { leftColumn, rightColumn }
+})
+
+
+
+
+
 function getDomain(url: string): string {
   try {
     const urlObj = new URL(url)
@@ -147,17 +187,31 @@ function getModelLogo(model: string): string | undefined {
                 </a>
             </div>
 
-            <!-- Image Search Results -->
+            <!-- Image Search Results - True Masonry Layout -->
             <div v-if="stage.image_references?.length" class="pr-3 py-3 relative z-10">
-              <div class="grid grid-cols-2 gap-2 items-start">
-                <a v-for="(img, idx) in stage.image_references" :key="idx" 
-                   v-show="!failedImages[img.url]"
-                   :href="img.url" target="_blank" 
-                   class="relative overflow-hidden transition-all hover:opacity-90 group">
-                  <img :src="img.thumbnail || img.url" 
-                       @error="handleImageError(img.url)"
-                       class="w-full h-auto block group-hover:scale-[1.02] transition-transform">
-                </a>
+              <div class="flex gap-2">
+                <!-- Left Column -->
+                <div class="flex-1 flex flex-col gap-2">
+                  <a v-for="(img, idx) in imageColumns.leftColumn" :key="`left-${img.url}-${idx}`" 
+                     :href="img.url" target="_blank" 
+                     class="relative overflow-hidden transition-all hover:opacity-90 group block">
+                    <img :src="img.thumbnail || img.url" 
+                         @load="handleImageLoad(img.url, $event)"
+                         @error="handleImageError(img.url)"
+                         class="w-full h-auto block group-hover:scale-[1.02] transition-transform">
+                  </a>
+                </div>
+                <!-- Right Column -->
+                <div class="flex-1 flex flex-col gap-2">
+                  <a v-for="(img, idx) in imageColumns.rightColumn" :key="`right-${img.url}-${idx}`" 
+                     :href="img.url" target="_blank" 
+                     class="relative overflow-hidden transition-all hover:opacity-90 group block">
+                    <img :src="img.thumbnail || img.url" 
+                         @load="handleImageLoad(img.url, $event)"
+                         @error="handleImageError(img.url)"
+                         class="w-full h-auto block group-hover:scale-[1.02] transition-transform">
+                  </a>
+                </div>
               </div>
             </div>
 

entari_plugin_hyw/card-ui/src/style.css

@@ -5,4 +5,25 @@
 /* Custom styles */
 body {
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+}
+
+/* Premium reading color scheme - applies to all prose elements */
+.prose {
+  color: var(--text-body, #3a3a3c) !important;
+}
+
+.prose h1, .prose h2, .prose h3, .prose h4, .prose h5, .prose h6 {
+  color: var(--text-primary, #2c2c2e) !important;
+}
+
+.prose p, .prose li, .prose td, .prose th {
+  color: var(--text-body, #3a3a3c) !important;
+}
+
+.prose strong, .prose b {
+  color: var(--text-primary, #2c2c2e) !important;
+}
+
+.prose code {
+  color: var(--text-body, #3a3a3c) !important;
 }

entari_plugin_hyw/image_cache.py

@@ -32,11 +32,9 @@ class ImageCache:
     def __init__(
         self, 
         max_size_kb: int = 500,  # Max image size to cache (KB)
-        timeout: float = 5.0,    # Download timeout per image
         max_concurrent: int = 6,  # Max concurrent downloads
     ):
         self.max_size_bytes = max_size_kb * 1024
-        self.timeout = timeout
         self.max_concurrent = max_concurrent
         
         # Cache storage: url -> base64_data_url or None (if failed)
@@ -78,7 +76,8 @@ class ImageCache:
         """
         async with self._semaphore:
             try:
-                async with httpx.AsyncClient(timeout=self.timeout, follow_redirects=True) as client:
+                # No timeout - images download until agent ends
+                async with httpx.AsyncClient(timeout=None, follow_redirects=True) as client:
                     resp = await client.get(url, headers={
                         "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36"
                     })
@@ -141,8 +140,6 @@ class ImageCache:
                     logger.debug(f"ImageCache: Cached {url} ({len(content)} bytes)")
                     return data_url
                     
-            except asyncio.TimeoutError:
-                logger.debug(f"ImageCache: Timeout downloading {url}")
             except Exception as e:
                 logger.debug(f"ImageCache: Failed to download {url}: {e}")
             
@@ -151,14 +148,13 @@ class ImageCache:
                 self._pending.pop(url, None)
             return None
     
-    async def get_cached(self, url: str, wait: bool = True, wait_timeout: float = 3.0) -> str:
+    async def get_cached(self, url: str, wait: bool = True) -> str:
         """
         Get cached image data URL, or original URL if not cached.
         
         Args:
             url: Original image URL
-            wait: If True, wait for pending download to complete
-            wait_timeout: Max time to wait for pending download
+            wait: If True, wait for pending download to complete (no timeout - waits until agent ends)
             
         Returns:
             Cached data URL or original URL
@@ -174,35 +170,34 @@ class ImageCache:
             
             pending_task = self._pending.get(url)
         
-        # Wait for pending download if requested
+        # Wait for pending download if requested (no timeout - waits until cancelled)
         if pending_task and wait:
             try:
-                await asyncio.wait_for(asyncio.shield(pending_task), timeout=wait_timeout)
+                await pending_task
                 async with self._lock:
                     cached = self._cache.get(url)
                     return cached if cached else url
-            except asyncio.TimeoutError:
-                logger.debug(f"ImageCache: Timeout waiting for {url}")
+            except asyncio.CancelledError:
+                logger.debug(f"ImageCache: Download cancelled for {url}")
                 return url
             except Exception:
                 return url
         
         return url
     
-    async def get_all_cached(self, urls: List[str], wait_timeout: float = 3.0) -> Dict[str, str]:
+    async def get_all_cached(self, urls: List[str]) -> Dict[str, str]:
         """
         Get cached URLs for multiple images.
         
         Args:
             urls: List of original URLs
-            wait_timeout: Max time to wait for all pending downloads
             
         Returns:
             Dict mapping original URL to cached data URL (or original if not cached)
         """
         result = {}
         
-        # Wait for all pending downloads first
+        # Wait for all pending downloads first (no timeout - waits until cancelled)
         pending_tasks = []
         async with self._lock:
             for url in urls:
@@ -211,12 +206,9 @@ class ImageCache:
         
         if pending_tasks:
             try:
-                await asyncio.wait_for(
-                    asyncio.gather(*pending_tasks, return_exceptions=True),
-                    timeout=wait_timeout
-                )
-            except asyncio.TimeoutError:
-                logger.debug(f"ImageCache: Timeout waiting for batch download")
+                await asyncio.gather(*pending_tasks, return_exceptions=True)
+            except asyncio.CancelledError:
+                logger.debug(f"ImageCache: Batch download cancelled")
         
         # Collect results
         for url in urls:
@@ -268,16 +260,15 @@ async def prefetch_images(urls: List[str]) -> None:
     cache.start_prefetch(urls)
 
 
-async def get_cached_images(urls: List[str], wait_timeout: float = 3.0) -> Dict[str, str]:
+async def get_cached_images(urls: List[str]) -> Dict[str, str]:
     """
     Convenience function to get cached images.
     
     Args:
         urls: List of original URLs
-        wait_timeout: Max time to wait
         
     Returns:
         Dict mapping original URL to cached data URL
     """
     cache = get_image_cache()
-    return await cache.get_all_cached(urls, wait_timeout=wait_timeout)
+    return await cache.get_all_cached(urls)

entari_plugin_hyw/misc.py

@@ -88,3 +88,41 @@ def resolve_model_name(name: str, models_config: List[Dict[str, Any]]) -> Tuple[
         
     # Default: assume it's a valid ID passed directly
     return name, None
+
+
+# Hardcoded markdown for refuse answer
+REFUSE_ANSWER_MARKDOWN = """
+<summary>
+Instruct 专家分配此任务流程失败，请尝试提出其他问题~
+</summary>
+"""
+
+
+async def render_refuse_answer(
+    renderer,
+    output_path: str,
+    theme_color: str = "#ef4444",
+) -> bool:
+    """
+    Render a refuse-to-answer image using hardcoded markdown.
+    
+    Args:
+        renderer: ContentRenderer instance
+        output_path: Path to save the output image
+        theme_color: Theme color for the card
+        
+    Returns:
+        True if render succeeded, False otherwise
+    """
+    return await renderer.render(
+        markdown_content=REFUSE_ANSWER_MARKDOWN,
+        output_path=output_path,
+        stats={},
+        references=[],
+        page_references=[],
+        image_references=[],
+        stages_used=[],
+        image_timeout=1000,  # No images to load
+        theme_color=theme_color,
+    )
+