thresholdfloor 0.3.2__tar.gz → 0.3.4__tar.gz

{thresholdfloor-0.3.2/src/thresholdfloor.egg-info → thresholdfloor-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thresholdfloor
-Version: 0.3.2
+Version: 0.3.4
 Summary: A floor below for tuning to what's above
 Author: WitchMithras
 License: Proprietary (staging)

{thresholdfloor-0.3.2 → thresholdfloor-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "thresholdfloor"
-version = "0.3.2"
+version = "0.3.4"
 description = "A floor below for tuning to what's above"
 requires-python = ">=3.11"
 dependencies = [

{thresholdfloor-0.3.2 → thresholdfloor-0.3.4}/src/thresholdfloor/floor_sigil.py

@@ -17,11 +17,63 @@ try:
 except Exception:
     pass
 try:
-    from PIL import Image, ImageChops, ImageOps, ImageFilter, ImageDraw, ImageFont, ImageTk, ImageEnhance
+    from PIL import Image, ImageOps, ImageChops, ImageOps, ImageFilter, ImageDraw, ImageFont, ImageTk, ImageEnhance, ImageColor
     PIL_EXISTS = True
 except Exception:
     pass
 
+DEFAULT_OUTER_RING_COLOR = (180, 150, 255, 180)
+PHASE_COLOR_RGBA = {
+    "black": (0, 0, 0, 90),
+    "white": (170, 170, 170, 170),
+    "yellow-gold": (170, 100, 40, 90),
+    "crimson-red": (190, 12, 20, 90),
+}
+
+
+def _coerce_ring_color(color, default=DEFAULT_OUTER_RING_COLOR):
+    if isinstance(color, str):
+        keyed = color.strip().lower().replace("_", "-").replace(" ", "-")
+        if keyed in PHASE_COLOR_RGBA:
+            return PHASE_COLOR_RGBA[keyed]
+
+        image_color = globals().get("ImageColor")
+        if image_color is not None:
+            try:
+                r, g, b = image_color.getrgb(color)
+                return (r, g, b, default[3])
+            except ValueError:
+                return default
+
+    if isinstance(color, (tuple, list)) and len(color) in (3, 4):
+        values = tuple(int(c) for c in color)
+        if len(values) == 3:
+            return (*values, default[3])
+        return values
+
+    return default
+
+
+def _phase_outer_ring_color(floor, default=DEFAULT_OUTER_RING_COLOR):
+    phase = getattr(floor, "current_phase", None)
+    if not phase and hasattr(floor, "get_phase"):
+        try:
+            phase = floor.get_phase()
+        except Exception:
+            phase = None
+
+    if not phase:
+        return default
+
+    COLORS = {
+        "Nigredo": "black",
+        "Albedo": "white",
+        "Citrinitas": "yellow-gold",
+        "Rubedo": "crimson-red",
+    }
+
+    return _coerce_ring_color(COLORS.get(phase), default)
+
 SIGNS = {
     '♈': 'Aries',
     '♉': 'Taurus',
@@ -151,7 +203,6 @@ sprite_lookup = {
 }
 
 def overlay_shadow_tree(base_img, rune, cx, cy, azimuth, altitude, size=64):
-    from PIL import Image, ImageEnhance, ImageFilter, ImageOps
     import math
     #cx, cy = cx + size, cy + size
     sprite_key = sprite_lookup.get(rune)
@@ -285,6 +336,8 @@ def overlay_tree_sprite(base_img, rune, position=None, size=48):
     else:
         return base_img
 
+    sprite = ImageEnhance.Brightness(sprite).enhance(0.6)
+
     sprite = sprite.resize((size, size), Image.LANCZOS)
     if position is None:
         x = base_img.width - size - 10
@@ -396,7 +449,10 @@ def _draw_sigil_glyphs(img, floor, font, cx, cy, r, observed_at):
                 #color = tuple(int(c * 0.4) for c in COLOR_PALLET.get(sign, (200, 200, 255, 240)))
             
             # All bright    
-            color = COLOR_PALLET.get(sign, (200, 200, 255, 240))
+            #color = COLOR_PALLET.get(sign, (200, 200, 255, 240))
+            
+            # All dark
+            color = tuple(int(c * 0.4) for c in COLOR_PALLET.get(sign, (200, 200, 255, 240)))
 
             glyph_img = Image.new("RGBA", (64, 64), (0, 0, 0, 0))
             glyph_draw = ImageDraw.Draw(glyph_img)
@@ -442,6 +498,75 @@ def _draw_sigil_shadow(img, cx, cy, alt, az, size=82):
         )
     return img
 
+def _polar(cx, cy, radius, angle_deg):
+    theta = math.radians(angle_deg)
+    return (
+        cx + radius * -math.sin(theta),
+        cy + radius * math.cos(theta),
+    )
+
+
+def _draw_sigil_ticks(img, cx, cy, r, every=5, major_every=30):
+    draw = ImageDraw.Draw(img)
+
+    outer = r * 1.33
+    minor_len = r * 0.025
+    major_len = r * 0.055
+
+    for deg in range(0, 360, every):
+        is_major = deg % major_every == 0
+        length = major_len if is_major else minor_len
+        width = 2 if is_major else 1
+
+        x1, y1 = _polar(cx, cy, outer - length, deg)
+        x2, y2 = _polar(cx, cy, outer, deg)
+
+        draw.line(
+            (x1, y1, x2, y2),
+            fill=(150, 115, 70, 150),
+            width=width,
+        )
+
+    return img
+
+
+def _draw_diamond(img, cx, cy, radius, angle_deg, scale=4, fill=(210, 165, 90, 210)):
+    draw = ImageDraw.Draw(img)
+    x, y = _polar(cx, cy, radius, angle_deg)
+
+    pts = [
+        (x, y - scale),
+        (x + scale, y),
+        (x, y + scale),
+        (x - scale, y),
+    ]
+
+    draw.line(pts + [pts[0]], fill=fill, width=1)
+    return img
+
+
+def _draw_motto_brackets(img, cx, cy, r):
+    ornament_r = r * 0.84
+
+    # Bracket ornaments around TEMPUS FUGIT
+    _draw_diamond(img, cx, cy, ornament_r, 38, scale=3)
+    _draw_diamond(img, cx, cy, ornament_r, 52, scale=3)
+
+    # Bracket ornaments around FESTINA LENTE
+    _draw_diamond(img, cx, cy, ornament_r, 310, scale=3)
+    _draw_diamond(img, cx, cy, ornament_r, 320, scale=3)
+
+    # Small keel mark at bottom center
+    _draw_diamond(img, cx, cy, ornament_r, 0, scale=4)
+
+    return img
+
+
+def _draw_sigil_ornaments(img, cx, cy, size, r):
+    _draw_sigil_ticks(img, cx, cy, r)
+    _draw_motto_brackets(img, cx, cy, r)
+    return img
+
 def _draw_curved_text(
     img,
     cx,
@@ -531,11 +656,14 @@ def _draw_curved_text(
 
         # Your current setup seems to like this orientation.
         # If letters face inward/upside-down, set rotation_offset=180.
+        
         glyph = glyph.rotate(
             -angle_deg + rotation_offset,
             resample=Image.BICUBIC,
             expand=True,
         )
+        #if reverse:
+            #glyph = ImageOps.mirror(glyph)
 
         ww, hh = glyph.size
         img.alpha_composite(glyph, (int(x - ww / 2), int(y - hh / 2)))
@@ -547,8 +675,11 @@ def _draw_sigil_inscribe(img, cx, cy, size, r):
         motto_font = _load_motto_font(max(8, int(size * 12 / 400)))
         motto_r = r * 0.72
         tracking_deg=1.8
-        latin_take = "FESTINA LENTE"
-        latin_late = "SERIUS EST"
+        latin_take = "LENTE"
+        latin_late = "FESTINA"
+        #latin_take = "FESTINA LENTE"
+        #latin_late = "TEMPUS FUGIT"
+        #latin_late = "SERIUS EST"
         # Bottom-right-ish
         _draw_curved_text(
             img,
@@ -563,6 +694,7 @@ def _draw_sigil_inscribe(img, cx, cy, size, r):
             stroke_fill=(20, 15, 10, 210),
             reverse=True,
             tracking_deg=tracking_deg,
+            rotation_offset=0
         )
         # Southwest
         _draw_curved_text(
@@ -578,6 +710,7 @@ def _draw_sigil_inscribe(img, cx, cy, size, r):
             stroke_fill=(20, 15, 10, 210),
             reverse=True,
             tracking_deg=tracking_deg,
+            rotation_offset=0
         )
 
         return img
@@ -586,21 +719,111 @@ def _draw_sigil_inscribe(img, cx, cy, size, r):
         print(e)
         return img
 
+def _draw_vestal_ring(
+    img,
+    cx,
+    cy,
+    phase,
+    waxing=True,
+    r=100,
+    color=(180, 150, 255, 180),
+    width=3,
+):
+    """
+    Draw a lunar phase ring.
+
+    phase:
+        0.0 = new moon
+        1.0 = full moon
+
+    waxing:
+        True  = right-side illumination
+        False = left-side illumination
+    """
+
+    draw = ImageDraw.Draw(img)
+
+    # Convert phase into angular sweep.
+    sweep = max(0.0, min(1.0, phase)) * 180.0
 
-def _render_clock_sigil_frame(floor, observed_at, size=512):
+    if waxing:
+        # Right side grows upward/downward from south.
+        start = 0 - sweep
+        end   = 0 + sweep
+
+    else:
+        # Left side.
+        start = 180 - sweep
+        end   = 180 + sweep
+
+    bbox = (
+        cx - r,
+        cy - r,
+        cx + r,
+        cy + r,
+    )
+
+    draw.arc(
+        bbox,
+        start=start,
+        end=end,
+        fill=color,
+        width=width,
+    )
+
+    return img
+
+def _render_clock_sigil_frame(floor, observed_at, size=512, ornaments=True, inscription=True, glyph=True, tree=True, shadow=True, vestal=False):
     try:
         img = _draw_sigil_background(size)
         cx, cy = size // 2, size // 2
         tree_size = max(1, int(size * (82 / 400)))
-        _draw_sigil_tree_axis(img, cx, cy, size=tree_size)
         font = _load_sigil_font(max(1, int(size * (36 / 400))))
         r = int((size // 2) * 0.75)
-        alt, az = _draw_sigil_glyphs(img, floor, font, cx, cy, r, observed_at)
 
-        _draw_sigil_shadow(img, cx, cy, alt, az, size=tree_size)
-
-        _draw_sigil_inscribe(img, cx, cy, size=size, r=r)
+        alt, az = _draw_sigil_glyphs(img, floor, font, cx, cy, r, observed_at)
+        if shadow:
+            _draw_sigil_shadow(img, cx, cy, alt, az, size=tree_size)
+        if tree:
+            _draw_sigil_tree_axis(img, cx, cy, size=tree_size)
+
+        if ornaments:
+            _draw_sigil_ornaments(img, cx, cy, size, r)
+        if inscription:
+            _draw_sigil_inscribe(img, cx, cy, size=size, r=r)
+        if vestal:
+            mt = floor.now_mt()
+            def infer_waxing() -> bool | None:
+                phase = getattr(mt, "moon_phase", None) or ""
+                p = str(phase).lower()
+                if p.startswith("wax"):
+                    return True
+                if p.startswith("wan"):
+                    return False
+                if "first quarter" in p:
+                    return True
+                if "last quarter" in p:
+                    return False
+                return None
+
+            waxing = infer_waxing()
+            illum_raw = mt.moon_illum / 100
+
+            if illum_raw > 100:
+                illum = illum_raw / 1000.0
+            else:
+                illum = illum_raw / 100.0
+            moon_phase_fraction = max(0.0, min(1.0, float(illum)))
 
+            _draw_vestal_ring(
+                img,
+                cx,
+                cy,
+                r=r * 1.15,
+                color=_phase_outer_ring_color(floor),
+                phase=moon_phase_fraction,
+                waxing=waxing
+            )
 
         return img
     except Exception as e:
@@ -734,47 +957,7 @@ def tf_sigil(floor, size=400):
 
             img.paste(glyph_img, (int(px), int(py)), glyph_img)
             lon += 30
-                # 🌙 Add Latin mottos inside the zodiac band
-        # 🌙 Big readable Latin mottos inside the zodiac band
-        try:
-            motto_font = _load_motto_font(max(14, int(size * 28 / 400)))
-            motto_r = r * 0.67
-            latin_take = "ACCIPE TEMPUS TUUM"
-            latin_late = "SERIUS EST QUAM COGITAS"
-
-            def _draw_motto(text, angle_deg):
-                theta_m = math.radians(angle_deg)
-
-                mx = cx + motto_r * -math.sin(theta_m)
-                my = cy + motto_r * math.cos(theta_m)
-
-                bb = motto_font.getbbox(text)
-                mw, mh = bb[2] - bb[0], bb[3] - bb[1]
-
-                # Simple shadow stroke so blind little society gremlins can see it
-                for ox, oy in [(-2, 0), (2, 0), (0, -2), (0, 2)]:
-                    draw.text(
-                        (mx - mw / 2 + ox, my - mh / 2 + oy),
-                        text,
-                        font=motto_font,
-                        fill=(20, 15, 10, 230),
-                    )
-
-                draw.text(
-                    (mx - mw / 2, my - mh / 2),
-                    text,
-                    font=motto_font,
-                    fill=(235, 205, 150, 255),
-                )
-
-            # Bottom-right-ish: Take your time
-            _draw_motto(latin_take, 315)
-
-            # Southwest in your reversed/south-facing setup
-            _draw_motto(latin_late, 45)
 
-        except Exception as e:
-            print(e) 
     except Exception as e:
         print(e)  
     # 🌳 Tree (axis)
@@ -916,7 +1099,7 @@ def animate_sigil(canvas, base_image_path, duration=4, floor=None, frame_count=2
 
         for i in range(frame_count):
             observed_at = start + (tick * i)
-            frame = _render_clock_sigil_frame(floor, observed_at, size=512)
+            frame = _render_clock_sigil_frame(floor, observed_at, size=512, ornaments=True, inscription=True, glyph=True, tree=True, shadow=True, vestal=True)
             #frames.append(frame.copy())
 
             frames.append(glow_layer(frame.copy(), passes=1))

{thresholdfloor-0.3.2 → thresholdfloor-0.3.4}/src/thresholdfloor/threshold_floor.py

@@ -381,6 +381,9 @@ class ThresholdFloor:
         self.visual_state = "idle"
         self.mode = "threshing"
         self.current_phase = None
+        self._direction = None
+        self._warm_side = None
+        self._position_label = None
         self.water_level = 0.0
         self.blood_level = 0.0
         self.wine_level = 0.0
@@ -493,7 +496,7 @@ class ThresholdFloor:
             max_length=getattr(self, "max_shadow_length", None),
         )
 
-    def shade_voice(self, timestamp: str | None = None) -> str:
+    def shade_voice(self, timestamp: str | None = None, prompt: str | None = None) -> str:
         """
         Return a simple textual cue based on the current shadow's azimuth.
 
@@ -514,18 +517,23 @@ class ThresholdFloor:
         """
         shadow = self.simulate_shadow(timestamp=timestamp)
         if shadow is None:
-            return None
+            return ""
+        if prompt:
+            if prompt.lower() == "who are you?":
+                return "Umbra sumus." # I am shade
 
         az = getattr(shadow, "shadow_azimuth_deg", None)
         if az is None:
-            return None
+            return "Utere, non numera" # Use the hours, do not count them.
 
         az = float(az) % 360.0
         if 20.0 <= az <= 160.0:
-            return "Take your time."
+            return "Carpe diem." # Sieze the day
         if 200.0 <= az <= 350.0:
-            return "It's later than you think."
-        return None
+            return "Serius est quam cogitas." # It is later than you think.
+        if az > 350.0:
+            return "Mox nox." # Soon it is night.
+        return "Si sol deficit, respicit me nemo." # If the sun is gone, nobody will look at me
 
     def add_shadow_mark_from_simulation(
         self,
@@ -626,6 +634,51 @@ class ThresholdFloor:
     def get_phase(self):
         return self.alchemy_phase()["phase"]
 
+    @property
+    def direction(self):
+        if getattr(self, "_direction", None) is None:
+            self.alchemy_phase()
+
+        return self._direction
+
+    @property
+    def hemisphere(self):
+        if getattr(self, "_hemisphere", None) is None:
+            self.alchemy_phase()
+
+        return self._hemisphere
+
+    @property
+    def warm_side(self):
+        if getattr(self, "_warm_side", None) is None:
+            self.alchemy_phase()
+
+        return self._warm_side
+
+    @property
+    def position_label(self):
+        if getattr(self, "_position_label", None) is None:
+            self.alchemy_phase()
+
+        return self._position_label
+
+    def get_job(self):
+        if self.current_phase is None:
+            self.alchemy_phase()
+
+        return FIELD_JOBS.get(self.current_phase)
+
+    def get_migration_state(self):
+        if self.current_phase is None:
+            self.alchemy_phase()
+
+        return {
+            "direction": self.direction,
+            "phase": self.current_phase,
+            "warm_side": self.warm_side,
+            "position": self.position_label,
+        }
+
     def alchemy_phase(self) -> Dict[str, Any]:
         """Discern alchemical phase from prior-day sunrise movement and position.
 
@@ -648,7 +701,7 @@ class ThresholdFloor:
         row = self
         tz = row.tz or os.getenv('TZ') or 'UTC'
         lat, _lon = row.latitude, row.longitude
-        hemisphere = 'north' if _lon >= 0.001 else 'south'
+        hemisphere = 'north' if lat >= 0.001 else 'south'
         east_arch = getattr(self, "arch_bearing_deg", 90.0)
         # Seed yesterday's azimuth and direction if missing
         today = _date_cls.today()
@@ -707,7 +760,14 @@ class ThresholdFloor:
             phase = 'Nigredo' if hemisphere == 'north' else 'Citrinitas'
         else:
             phase = 'Rubedo' if warm_side else 'Nigredo' if hemisphere == 'north' else 'Nigredo' if warm_side else 'Rubedo'
-        self.phase = phase
+        self.current_phase = phase
+        if heading == hemisphere:
+            self._direction = 'ascending'
+        else:
+            self._direction = 'descending'
+        self._hemisphere = hemisphere
+        self._warm_side = warm_side
+        self._position_label = position_label
         return {
             'phase': phase,
             'heading': heading,
@@ -717,6 +777,7 @@ class ThresholdFloor:
             'east_arch': east_arch,
         }
 
+
     def sun_delay(self) -> Dict[str, Any]:
         angle = scan_vector(self.latitude, self.longitude, self.get_sunrise())
         delay = estimate_sun_delay(angle)
@@ -786,8 +847,7 @@ class ThresholdFloor:
         return datetime.now(tzinfo)
 
     def now_mt(self) -> datetime:
-        MoonTime.from_dt(self.now())
-        return MoonTime.from_dt(self.now())
+        return MoonTime.from_datetime(self.now())
 
     def weather(self) -> str:
         if not WEATHER_EXISTS:

{thresholdfloor-0.3.2 → thresholdfloor-0.3.4/src/thresholdfloor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thresholdfloor
-Version: 0.3.2
+Version: 0.3.4
 Summary: A floor below for tuning to what's above
 Author: WitchMithras
 License: Proprietary (staging)