labfreed 1.0.0a3__tar.gz → 1.0.0a4__tar.gz

{labfreed-1.0.0a3 → labfreed-1.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 1.0.0a3
+Version: 1.0.0a4
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Requires-Python: >=3.11

{labfreed-1.0.0a3 → labfreed-1.0.0a4}/labfreed/__init__.py

@@ -2,7 +2,7 @@
 Python implementation of LabFREED building blocks
 '''
 
-__version__ = "1.0.0a3"
+__version__ = "1.0.0a4"
 
 from labfreed.pac_id import *  # noqa: F403
 from labfreed.pac_cat import * # noqa: F403

{labfreed-1.0.0a3 → labfreed-1.0.0a4}/labfreed/labfreed_extended/app/app_infrastructure.py

@@ -3,7 +3,7 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 
 import requests
 
-from labfreed.labfreed_extended.app.pac_info import PacInfo
+from labfreed.labfreed_extended.app.pac_info.pac_info import PacInfo
 from labfreed.pac_attributes.client.attribute_cache import MemoryAttributeCache
 from labfreed.pac_attributes.client.client import AttributeClient, http_attribute_request_default_callback_factory
 from labfreed.pac_attributes.pythonic.py_attributes import pyAttributeGroup

labfreed-1.0.0a4/labfreed/labfreed_extended/app/pac_info/html_renderer/external-link.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icons/external-link</title>
+    <g id="icons/external-link" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M5.10570888,18.8942911 C4.83722343,18.6258057 4.81484965,18.204406 5.03858752,17.9104349 L5.10570888,17.8336309 L15.9992174,6.94117952 L10.8105793,6.93942074 L10.7088087,6.93257412 C10.3427331,6.8829117 10.0605793,6.5691165 10.0605793,6.18942074 C10.0605793,5.81286295 10.3380887,5.50112097 10.6997498,5.44755266 L10.8105793,5.43942074 L18.5605793,5.43942074 L18.5605793,13.1894207 L18.5537326,13.2911913 C18.5090365,13.6206593 18.2503927,13.8821507 17.9223127,13.9311544 L17.8105793,13.9394207 L17.7088087,13.9325741 C17.3793407,13.8878779 17.1178493,13.6292342 17.0688456,13.3011542 L17.0605793,13.1894207 L17.0598776,8.00183969 L6.16636906,18.8942911 C5.87347584,19.1871843 5.3986021,19.1871843 5.10570888,18.8942911 Z" id="Icons/Navigation/External-Link/Dark" fill="#1C1847" fill-rule="nonzero"></path>
+    </g>
+</svg>

labfreed-1.0.0a4/labfreed/labfreed_extended/app/pac_info/html_renderer/macros.jinja.html

@@ -0,0 +1,188 @@
+{# ---------- PAC-INFO MACROS ---------- #}
+{# These macros render semantic HTML with light class hooks. #}
+
+{%- macro info_card(pac_info) -%}
+<section class="lf-info-card">
+    <div class="lf-info-title">{{ pac_info.display_name }}</div>
+  <div class="lf-info-grid">
+    {% if pac_info.image_url %}
+        <img src="{{ pac_info.image_url }}" class="prod_img lf-info-item" alt="">
+    {% endif %}
+  
+    {% if pac_info.main_category %}
+        {% for c in pac_info.pac_id.categories %}
+            {% for k, v in c.segments_as_dict().items() %}
+                {% if k != "key" %}
+                <div class="lf-info-item">
+                    {% if k %}
+                    <div class="lf-info-key">{{ k }}</div>
+                    {% else %}
+                    <div class="lf-info-key"> <i>{{"No Key" }}</i></div>
+                    {% endif %}
+                    <div class="lf-info-val">{{ v }}</div>
+                </div>
+                {% endif %}
+            {% endfor %}
+        {% endfor %}
+    {% endif %}
+
+    </div>
+    {% if pac_info.safety_pictograms %}
+        {% for p in pac_info.safety_pictograms.values() %}
+        <figure class="lf-figure lf-figure--image">
+            <img src="{{ p.value|e }}" alt="{{ p.label|e }}" class="lf-attr-image">
+            <figcaption class="lf-figure__caption sr-only">{{ p.label }}</figcaption>
+        </figure>
+        {% endfor %}
+    {% endif %}
+
+  </section>
+{%- endmacro -%}
+
+
+{%- macro key_value_table(pairs) -%}
+  {# pairs: dict-like object #}
+  <table class="lf-table lf-table--kv">
+    <tbody>
+      {%- for k, v in pairs.items() -%}
+        {%- if k != "key" -%}
+          <tr>
+            <th class="lf-th lf-th--key">{{ k }}</th>
+            <td class="lf-td lf-td--val">{{ v }}</td>
+          </tr>
+        {%- endif -%}
+      {%- endfor -%}
+    </tbody>
+  </table>
+{%- endmacro -%}
+
+
+{%- macro category_block(category) -%}
+  <div class="lf-section lf-section--category">
+    <h5 class="lf-section__title">{{ category.__class__.__name__ }}</h5>
+    {{ key_value_table(category.segments_as_dict()) }}
+  </div>
+{%- endmacro -%}
+
+
+{%- macro services_table(user_handover_group) -%}
+<div class="lf-section lf-section--services">
+  <div class="lf-origin-hint">from {{ user_handover_group.origin }}</div>
+  <div class="lf-services">
+    {%- for s in user_handover_group.services -%}
+      <a href="{{ s.url }}" target="_blank" rel="noopener" class="lf-service">
+        <span class="lf-service__icon"> 
+            {% include "external-link.svg" %}
+        </span>
+        <span class="lf-service__name">{{ s.service_name }}</span>
+      </a>
+    {%- endfor -%}
+  </div>
+</div>
+{%- endmacro -%}
+
+
+{%- macro reference_value(value) -%}
+<span class="lf-reference">{{ value }}</span>
+{%- endmacro -%}
+
+
+{%- macro attribute_row(a) -%}
+  <tr>
+    <th class="lf-th lf-th--key">{{ a.label }}</th>
+    <td class="lf-td lf-td--val">
+        {% set value = a.value %}
+        {%- if is_image(value) -%}
+            <figure class="lf-figure lf-figure--image">
+                <img src="{{ value|e }}" alt="{{ label|e }}" class="lf-attr-image">
+                <figcaption class="lf-figure__caption sr-only">{{ label }}</figcaption>
+            </figure>
+        {%- elif is_url(value) -%}
+            <a href="{{ value|e }}" target="_blank" rel="noopener" class="lf-link">{{ value }}</a>
+        {%- elif is_reference(value) -%}
+            {{ reference_value(value)}}
+        {%- else -%}
+            <span class="lf-text">{{ value }}</span>
+        {%- endif -%}
+    </td>
+  </tr>
+{%- endmacro -%}
+
+
+{%- macro attribute_group_block(ag) -%}
+  <div class="lf-section lf-section--attributes">
+    <h5 class="lf-section__title">
+      {{ ag.label }} <span class="lf-origin-hint">(from {{ ag.origin }})</span>
+    </h5>
+    <table class="lf-table lf-table--kv">
+      <tbody>
+        {%- for a in ag.attributes.values() -%}
+          {{ attribute_row(a) }}
+        {%- endfor -%}
+      </tbody>
+    </table>
+</div>
+{%- endmacro -%}
+
+
+{%- macro data_table_inline(dt) -%}
+  {# Renders your DataTable structure; expects filters: is_data_table(dt) #}
+  {%- if dt.data | length == 1 -%}
+    <table class="lf-table lf-table--kv">
+      <tbody>
+        {%- for i in range(dt.col_names | length) -%}
+          <tr>
+            <th class="lf-th lf-th--key">{{ dt.col_names[i] }}</th>
+            <td class="lf-td lf-td--val">{{ dt.data[0][i] }}</td>
+          </tr>
+        {%- endfor -%}
+      </tbody>
+    </table>
+  {%- else -%}
+    <table class="lf-table lf-table--grid">
+      <thead>
+        <tr>
+          {%- for rn in dt.col_names -%}
+            <th class="lf-th">{{ rn }}</th>
+          {%- endfor -%}
+        </tr>
+      </thead>
+      <tbody>
+        {%- for row in dt.data -%}
+          <tr>
+            {%- for e in row -%}
+              <td class="lf-td">{{ e }}</td>
+            {%- endfor -%}
+          </tr>
+        {%- endfor -%}
+      </tbody>
+    </table>
+  {%- endif -%}
+{%- endmacro -%}
+
+
+{%- macro attached_data_block(attached_data) -%}
+  <div class="lf-section lf-section--attached">
+    {%- for name, trex in attached_data.items() -%}
+      <div class="lf-subsection">
+        <h5 class="lf-subsection__title">{{ name }}</h5>
+        <table class="lf-table lf-table--kv">
+          <tbody>
+            {%- for k, v in trex.items() -%}
+              <tr>
+                <th class="lf-th lf-th--key">{{ k }}</th>
+                <td class="lf-td lf-td--val">
+                  {%- if is_data_table(v) -%}
+                    {{ data_table_inline(v) }}
+                  {%- else -%}
+                    {{ v }}
+                  {%- endif -%}
+                </td>
+              </tr>
+            {%- endfor -%}
+          </tbody>
+        </table>
+    </div>
+    {%- endfor -%}
+    </div>
+{%- endmacro -%}

labfreed-1.0.0a4/labfreed/labfreed_extended/app/pac_info/html_renderer/pac-info-style.css

@@ -0,0 +1,176 @@
+ 
+    .lf-section {
+      margin-top: 0.5rem;
+    }
+
+    .lf-origin-hint {
+      font-style: italic;     /* cursive */
+      font-size: 1rem;        /* reset to regular text size */
+      font-weight: normal;    /* not bold, even if inside a heading */
+    }
+    
+
+    .lf-results {
+      display: grid;
+      gap: 1.5rem;
+      padding: 1rem;      /* space around the whole grid */
+    }
+
+    .lf-info-card {
+      width:100%;
+      border: solid 1px #ccc;
+      border-radius: 8px;
+    }
+
+    .lf-info-card {
+      padding: 1rem;
+      border: 1px solid #e5e7eb;
+      border-radius: 8px;
+      background: #fff;
+    }
+    
+    /* title as "slightly bigger text" */
+    .lf-info-title {
+      font-size: 1.25rem;   /* a bit larger than normal text */
+      font-weight: 600;
+      margin-bottom: 1rem;
+    }
+    
+    /* responsive grid for key/value */
+    .lf-info-grid {
+      display: grid;
+      gap: 1rem;
+      grid-template-columns: repeat(auto-fit, minmax(10rem, 1fr));
+    }
+    
+    .lf-info-item {
+      display: flex;
+      flex-direction: column;
+      gap: 0.25rem;
+      padding: 0.5rem;
+    }
+    
+    .lf-info-key {
+      font-size: 0.875rem;
+      font-weight: 600;
+      color: #374151; /* slate-700 */
+    }
+    
+    .lf-info-val {
+      font-size: 1rem;
+      color: #111827; /* slate-900 */
+    }
+    
+
+
+    .prod_img {
+      height: 10vw;
+      width: auto;
+    }
+
+
+    /* Apply to all PAC macro tables */
+    .lf-table {
+      width: 100%;
+      border-collapse: collapse;
+      table-layout: fixed;   /* ensures consistent column widths */
+    }
+    
+    .lf-table th,
+    .lf-table td {
+      border: 1px solid #ccc;
+      padding: 0.4rem 0.6rem;
+      vertical-align: top;
+      text-align: left;
+    }
+    
+    /* Key/value style: 1/3 vs 2/3 columns */
+    .lf-table--kv th.lf-th--key {
+      width: 33%;
+      font-weight: 600;
+    }
+    .lf-table--kv td.lf-td--val {
+      width: 67%;
+    }
+
+    .lf-attr-image {
+      width: 30px;
+    }
+
+    /* Services laid out as equal-width grid columns */
+    .lf-services {
+      display: grid;
+      gap: 0.75rem;
+    
+      /* 2 columns on small, 3 on md, 4 on lg — tweak as you like */
+      grid-template-columns: repeat(2, 1fr);
+    }
+    
+    @media (min-width: 640px) {
+      .lf-services { grid-template-columns: repeat(3, 1fr); }
+    }
+    @media (min-width: 1024px) {
+      .lf-services { grid-template-columns: repeat(4, 1fr); }
+    }
+    
+    /* Each service card fills its grid cell */
+    .lf-service {
+      display: flex;            /* still use flex inside for icon + text */
+      align-items: center;
+      gap: 0.4rem;
+      padding: 0.4rem 0.6rem;
+      height: 100%;             /* same height across a row (since your content height is uniform) */
+      width: 100%;              /* ensure full cell width */
+      text-decoration: none;
+      color: var(--lf-link, #2563eb);
+    }
+    
+    .lf-service:hover {
+      font-size: 1.05em;            /* ~5% larger */
+      text-decoration: none;
+    }
+    
+    .lf-service__icon { width: 1rem; height: 1rem; flex-shrink: 0; }
+    .lf-service__name {
+      flex: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+        
+
+
+    /* Position context */
+    .lf-ref-card-wrap {
+        position: relative;
+        display: inline-block;
+    }
+    
+    /* The floating card is hidden by default */
+    .lf-ref-card {
+        display: none;
+        position: absolute;
+        top: 100%;       /* appear below the reference text */
+        left: 0;
+        z-index: 1000;
+        width: min(420px, 90vw);
+        margin-top: .5rem;
+        padding: 1rem;
+        background: #fff;
+        border: 1px solid #e5e7eb;
+        border-radius: 8px;
+        box-shadow: 0 10px 20px rgba(0,0,0,.08);
+    }
+    
+    /* Show on hover */
+    .lf-ref-card-wrap:hover .lf-ref-card {
+        display: block;
+    }
+    
+    /* Style the inline reference */
+    .lf-reference {
+        color: var(--lf-link, #2563eb);
+    }
+
+
+  

labfreed-1.0.0a4/labfreed/labfreed_extended/app/pac_info/html_renderer/pac_info.jinja.html

@@ -0,0 +1,46 @@
+{% import "macros.jinja.html" as pac with context %}
+
+<style>
+    {% include "pac-info-style.css" %}
+</style>
+
+
+{% if pac_info %}
+    <section class="lf-results">
+        {# ----- Info Card ---- #}
+        {{ pac.info_card(pac_info) }}
+        
+        {# ---- Services ---- #}
+        {% if pac_info.user_handovers %}
+            <section>
+            <!--<h4>Services</h4>-->
+            {% for sg in pac_info.user_handovers %}
+            {{ pac.services_table(sg) }}
+            {% endfor %}
+            </section>
+        {% endif %}
+
+        {# ---- Attributes ---- #}
+        {% if pac_info.attributes %}
+            <section>
+            <!--<h4>Attributes</h4>-->
+            {% for ag in pac_info.attributes.values() %}
+            {% if ag.key not in hide_attribute_groups %}
+                {{ pac.attribute_group_block(ag) }}
+            {% endif %}
+            {% endfor %}
+            </section>
+
+        {% endif %}
+
+        {# ---- Attached Data ---- #}
+        {% if pac_info.attached_data %}
+            <section>
+                <!--<h4 class="lf-section__title">Attached Data</h4>-->
+                {{ pac.attached_data_block(pac_info.attached_data) }}
+            </section>
+        {% endif %}
+
+    </section>
+
+{% endif %}

labfreed-1.0.0a4/labfreed/labfreed_extended/app/pac_info/html_renderer/pac_info_card.jinja.html

@@ -0,0 +1,7 @@
+{% import "macros.jinja.html" as macros with context %}
+
+
+<style>
+    {% include "pac-info-style.css" %}
+</style>
+{{ macros.info_card(pac_info) }}

{labfreed-1.0.0a3/labfreed/labfreed_extended/app → labfreed-1.0.0a4/labfreed/labfreed_extended/app/pac_info}/pac_info.py

@@ -1,13 +1,17 @@
 
 
 from functools import cached_property
+from pathlib import Path
+from urllib.parse import urlparse
+from jinja2 import Environment, FileSystemLoader, select_autoescape
 from pydantic import BaseModel, Field
-from labfreed.pac_attributes.pythonic.py_attributes import pyAttribute, pyAttributeGroup, pyAttributes
+from labfreed.pac_attributes.pythonic.py_attributes import pyAttribute, pyAttributeGroup, pyAttributes, pyReference
 from labfreed.pac_attributes.well_knonw_attribute_keys import MetaAttributeKeys
 from labfreed.pac_cat.pac_cat import PAC_CAT
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.pac_id_resolver.services import ServiceGroup
 from labfreed.labfreed_extended.app.formatted_print import StringIOLineBreak
+from labfreed.trex.pythonic.data_table import DataTable
 from labfreed.trex.pythonic.pyTREX import pyTREX
 from labfreed.well_known_extensions.display_name_extension import DisplayNameExtension
 
@@ -112,6 +116,39 @@ class PacInfo(BaseModel):
 
         return out
     
+    
+    
+    def render_html(self, hide_attribute_groups:list[str]=[]) -> str:        
+        return PACInfo_HTMLRenderer.render_template('pac_info_main.jinja.html', 
+                               pac_info = self, 
+                               hide_attribute_groups=hide_attribute_groups
+                               )
         
+    def render_html_card(self) -> str:
+        return PACInfo_HTMLRenderer.render_template('pac_info_card.jinja.html', 
+                               pac_info = self
+                               )
+    
         
+class PACInfo_HTMLRenderer():
+    TEMPLATES_DIR = Path(__file__).parent / "html_renderer"
+    jinja_env = Environment(
+        loader=FileSystemLoader(str(TEMPLATES_DIR), encoding="utf-8"),
+        autoescape=select_autoescape(enabled_extensions=("html", "jinja", "jinja2", "jinja.html")),
+    )
+    
+    @classmethod
+    def render_template(cls, template_name:str, pac_info:PacInfo, hide_attribute_groups):
+        # --- Jinja env pointing at /html_renderer ---
+        template = cls.jinja_env.get_template("pac_info.jinja.html")
+        html = template.render(
+            pac=pac_info.pac_id,
+            pac_info=pac_info,  # your object
+            hide_attribute_groups=hide_attribute_groups,
+            is_data_table = lambda value: isinstance(value, DataTable),
+            is_url = lambda s: isinstance(s, str) and urlparse(s).scheme in ('http', 'https') and bool(urlparse(s).netloc),
+            is_image = lambda s: isinstance(s, str) and s.lower().startswith('http') and s.lower().endswith(('.jpg','.jpeg','.png','.gif','.bmp','.webp','.svg','.tif','.tiff')),
+            is_reference = lambda s: isinstance(s, pyReference) ,
+        )
+        return html