taskclf 0.2.2__tar.gz → 0.2.3__tar.gz

{taskclf-0.2.2 → taskclf-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: taskclf
-Version: 0.2.2
+Version: 0.2.3
 Summary: Local-first task classifier that infers your work type from computer activity signals
 Author: fruitiecutiepie
 Author-email: fruitiecutiepie <104437268+fruitiecutiepie@users.noreply.github.com>

{taskclf-0.2.2 → taskclf-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "taskclf"
-version = "0.2.2"
+version = "0.2.3"
 description = "Local-first task classifier that infers your work type from computer activity signals"
 readme = "README.md"
 license = {text = "MIT"}

{taskclf-0.2.2 → taskclf-0.2.3}/src/taskclf/cli/main.py

@@ -45,7 +45,7 @@ app = typer.Typer()
 @app.callback()
 def main(
     version: bool = typer.Option(
-        False, "--version", "-V", callback=_version_callback, is_eager=True,
+        False, "--version", "-v", callback=_version_callback, is_eager=True,
         help="Show version and exit.",
     ),
 ) -> None:
@@ -2167,7 +2167,7 @@ def tray_cmd(
     aw_host: str = typer.Option(DEFAULT_AW_HOST, "--aw-host", help="ActivityWatch server URL"),
     poll_seconds: int = typer.Option(DEFAULT_POLL_SECONDS, "--poll-seconds", help="Seconds between polling iterations"),
     title_salt: str = typer.Option(DEFAULT_TITLE_SALT, "--title-salt", help="Salt for hashing window titles"),
-    data_dir: str = typer.Option(DEFAULT_DATA_DIR, help="Processed data directory"),
+    data_dir: str | None = typer.Option(None, "--data-dir", help="Processed data directory (default: data/processed; ephemeral in --dev)"),
     transition_minutes: int = typer.Option(DEFAULT_TRANSITION_MINUTES, "--transition-minutes", help="Minutes a new app must persist before prompting to label"),
     port: int = typer.Option(8741, "--port", help="Port for the embedded web UI server"),
     dev: bool = typer.Option(False, "--dev", help="Start Vite dev server for frontend hot reload"),
@@ -2180,21 +2180,39 @@ def tray_cmd(
     Left-clicking the tray icon opens the web dashboard where all
     labeling is done.  Right-click shows a minimal menu with Quit.
     """
+    import shutil
+    import tempfile
+
     from taskclf.ui.tray import run_tray
 
-    run_tray(
-        model_dir=Path(model_dir) if model_dir else None,
-        aw_host=aw_host,
-        poll_seconds=poll_seconds,
-        title_salt=title_salt,
-        data_dir=Path(data_dir),
-        transition_minutes=transition_minutes,
-        ui_port=port,
-        dev=dev,
-        browser=browser,
-        no_tray=no_tray,
-        username=username,
-    )
+    tmp_dir: str | None = None
+    if data_dir is not None:
+        resolved_data_dir = data_dir
+    elif dev:
+        tmp_dir = tempfile.mkdtemp(prefix="taskclf-dev-")
+        resolved_data_dir = tmp_dir
+        typer.echo(f"Dev mode: using ephemeral data dir → {tmp_dir}")
+    else:
+        resolved_data_dir = DEFAULT_DATA_DIR
+
+    try:
+        run_tray(
+            model_dir=Path(model_dir) if model_dir else None,
+            aw_host=aw_host,
+            poll_seconds=poll_seconds,
+            title_salt=title_salt,
+            data_dir=Path(resolved_data_dir),
+            transition_minutes=transition_minutes,
+            ui_port=port,
+            dev=dev,
+            browser=browser,
+            no_tray=no_tray,
+            username=username,
+        )
+    finally:
+        if tmp_dir is not None:
+            shutil.rmtree(tmp_dir, ignore_errors=True)
+            typer.echo(f"Dev mode: cleaned up ephemeral data dir → {tmp_dir}")
 
 
 # -- ui -----------------------------------------------------------------------
@@ -2207,14 +2225,16 @@ def ui_serve_cmd(
     aw_host: str = typer.Option(DEFAULT_AW_HOST, "--aw-host", help="ActivityWatch server URL"),
     poll_seconds: int = typer.Option(DEFAULT_POLL_SECONDS, "--poll-seconds", help="Seconds between AW polling iterations"),
     title_salt: str = typer.Option(DEFAULT_TITLE_SALT, "--title-salt", help="Salt for hashing window titles"),
-    data_dir: str = typer.Option(DEFAULT_DATA_DIR, help="Processed data directory"),
+    data_dir: str | None = typer.Option(None, "--data-dir", help="Processed data directory (default: data/processed; ephemeral in --dev)"),
     transition_minutes: int = typer.Option(DEFAULT_TRANSITION_MINUTES, "--transition-minutes", help="Minutes a new app must persist before suggesting a label"),
     browser: bool = typer.Option(False, "--browser", help="Open in browser instead of native window"),
     dev: bool = typer.Option(False, "--dev", help="Start Vite dev server for frontend hot reload"),
 ) -> None:
     """Launch the labeling UI as a native floating window with live prediction streaming."""
     import os
+    import shutil
     import subprocess
+    import tempfile
     import threading
 
     import uvicorn
@@ -2224,6 +2244,16 @@ def ui_serve_cmd(
     from taskclf.ui.tray import ActivityMonitor, _LabelSuggester
     from taskclf.ui.window import WindowAPI, run_window
 
+    tmp_dir: str | None = None
+    if data_dir is not None:
+        resolved_data_dir = data_dir
+    elif dev:
+        tmp_dir = tempfile.mkdtemp(prefix="taskclf-dev-")
+        resolved_data_dir = tmp_dir
+        typer.echo(f"Dev mode: using ephemeral data dir → {tmp_dir}")
+    else:
+        resolved_data_dir = DEFAULT_DATA_DIR
+
     bus = EventBus()
     win_api = WindowAPI()
 
@@ -2272,7 +2302,7 @@ def ui_serve_cmd(
     monitor_thread.start()
 
     fastapi_app = create_app(
-        data_dir=Path(data_dir),
+        data_dir=Path(resolved_data_dir),
         aw_host=aw_host,
         title_salt=title_salt,
         event_bus=bus,
@@ -2344,6 +2374,9 @@ def ui_serve_cmd(
         if vite_proc is not None:
             vite_proc.terminate()
             vite_proc.wait(timeout=5)
+        if tmp_dir is not None:
+            shutil.rmtree(tmp_dir, ignore_errors=True)
+            typer.echo(f"Dev mode: cleaned up ephemeral data dir → {tmp_dir}")
 
 
 if __name__ == "__main__":

{taskclf-0.2.2 → taskclf-0.2.3}/src/taskclf/labels/store.py

@@ -179,6 +179,74 @@ def append_label_span(span: LabelSpan, path: Path) -> Path:
     return write_label_spans(existing, path)
 
 
+def update_label_span(
+    start_ts: dt.datetime,
+    end_ts: dt.datetime,
+    new_label: str,
+    path: Path,
+) -> LabelSpan:
+    """Change the label on an existing span identified by its timestamps.
+
+    Args:
+        start_ts: Original start timestamp of the span.
+        end_ts: Original end timestamp of the span.
+        new_label: Replacement label (must be in ``LABEL_SET_V1``).
+        path: Parquet file containing label spans.
+
+    Returns:
+        The updated ``LabelSpan``.
+
+    Raises:
+        ValueError: If no matching span is found or the new label is
+            invalid.
+    """
+    if not path.exists():
+        raise ValueError("No labels file found")
+
+    spans = read_label_spans(path)
+    for i, s in enumerate(spans):
+        if s.start_ts == start_ts and s.end_ts == end_ts:
+            updated = LabelSpan(
+                start_ts=s.start_ts,
+                end_ts=s.end_ts,
+                label=new_label,
+                provenance=s.provenance,
+                user_id=s.user_id,
+                confidence=s.confidence,
+                extend_forward=s.extend_forward,
+            )
+            spans[i] = updated
+            write_label_spans(spans, path)
+            return updated
+    raise ValueError(f"No label found for [{start_ts}, {end_ts})")
+
+
+def delete_label_span(
+    start_ts: dt.datetime,
+    end_ts: dt.datetime,
+    path: Path,
+) -> None:
+    """Remove a label span identified by its timestamps.
+
+    Args:
+        start_ts: Start timestamp of the span to remove.
+        end_ts: End timestamp of the span to remove.
+        path: Parquet file containing label spans.
+
+    Raises:
+        ValueError: If no matching span is found.
+    """
+    if not path.exists():
+        raise ValueError("No labels file found")
+
+    spans = read_label_spans(path)
+    original_len = len(spans)
+    spans = [s for s in spans if not (s.start_ts == start_ts and s.end_ts == end_ts)]
+    if len(spans) == original_len:
+        raise ValueError(f"No label found for [{start_ts}, {end_ts})")
+    write_label_spans(spans, path)
+
+
 def generate_label_summary(
     features_df: pd.DataFrame,
     start_ts: dt.datetime,

{taskclf-0.2.2 → taskclf-0.2.3}/src/taskclf/ui/frontend/src/App.tsx

@@ -89,11 +89,33 @@ const PanelApp: Component = () => {
           width: inBrowser ? `${CONTENT_W}px` : "100%",
           ...(inBrowser
             ? { "max-height": `${PANEL_MAX_H}px` }
-            : { height: "100vh" }),
+            : { height: "100vh", display: "flex", "flex-direction": "column" }),
           overflow: "auto",
           padding: "4px",
         }}
       >
+        <Show when={!inBrowser}>
+          <div
+            class="pywebview-drag-region"
+            style={{
+              height: "10px",
+              cursor: "grab",
+              "flex-shrink": "0",
+              display: "flex",
+              "justify-content": "center",
+              "align-items": "center",
+            }}
+          >
+            <div
+              style={{
+                width: "32px",
+                height: "3px",
+                "border-radius": "2px",
+                background: "rgba(255,255,255,0.15)",
+              }}
+            />
+          </div>
+        </Show>
         <StatePanel
           status={ws.connectionStatus}
           latestStatus={ws.latestStatus}
@@ -188,8 +210,6 @@ const App: Component = () => {
               latestPrediction={ws.latestPrediction}
               latestTrayState={ws.latestTrayState}
               activeSuggestion={ws.activeSuggestion}
-              wsStats={ws.wsStats}
-              compact={!hovering()}
               onTogglePanel={inBrowser ? browserTogglePanel : undefined}
               onShowLabel={inBrowser ? undefined : showLabel}
               onHideLabel={inBrowser ? undefined : hideLabel}

taskclf-0.2.3/src/taskclf/ui/frontend/src/components/ActivityContext.tsx

@@ -0,0 +1,251 @@
+import { type Accessor, type Component, createResource, For, Show } from "solid-js";
+import { fetchAWLive, fetchFeatureSummary } from "../lib/api";
+import type { Prediction } from "../lib/ws";
+import { LABEL_COLORS } from "./StatePanel";
+
+function shortAppName(app: string): string {
+  const parts = app.split(".");
+  return parts[parts.length - 1];
+}
+
+function fmtRate(v: number | null): string | null {
+  if (v == null) return null;
+  return v < 10 ? v.toFixed(1) : String(Math.round(v));
+}
+
+export interface TimeRange {
+  start: string;
+  end: string;
+}
+
+function timeRangeForMinutes(mins: number): TimeRange | null {
+  if (mins < 1) return null;
+  const now = new Date();
+  const start = new Date(now.getTime() - mins * 60_000);
+  return {
+    start: start.toISOString(),
+    end: now.toISOString(),
+  };
+}
+
+export const ActivityContext: Component<{
+  minutes?: Accessor<number>;
+  timeRange?: Accessor<TimeRange | null>;
+  prediction?: Accessor<Prediction | null>;
+  showEmpty?: boolean;
+}> = (props) => {
+  const range = () =>
+    props.timeRange?.() ?? (props.minutes ? timeRangeForMinutes(props.minutes()) : null);
+
+  const [awApps] = createResource(range, async (r) => {
+    if (!r) return [];
+    try {
+      return await fetchAWLive(r.start, r.end);
+    } catch {
+      return [];
+    }
+  });
+
+  const [features] = createResource(range, async (r) => {
+    if (!r) return null;
+    try {
+      return await fetchFeatureSummary(r.start, r.end);
+    } catch {
+      return null;
+    }
+  });
+
+  const pred = () => props.prediction?.();
+  const isLoading = () => awApps.loading || features.loading;
+  const hasAwApps = () => (awApps() ?? []).length > 0;
+  const featureApps = () => (features()?.top_apps ?? []).slice(0, 5);
+  const hasFeatureApps = () => featureApps().length > 0;
+  const hasApps = () => hasAwApps() || hasFeatureApps();
+  const hasStats = () => {
+    const f = features();
+    return f && (f.mean_keys_per_min != null || f.mean_clicks_per_min != null);
+  };
+  const hasCoverage = () => {
+    const f = features();
+    return f && f.total_buckets > 0;
+  };
+  const hasAnything = () => pred() || hasApps() || hasStats() || hasCoverage();
+  const shouldShow = () => hasAnything() || props.showEmpty;
+
+  const containerStyle = {
+    padding: "4px 0 6px",
+    margin: "0 0 4px",
+    "border-top": "1px dashed var(--border)",
+    "border-bottom": "1px dashed var(--border)",
+    display: "flex",
+    "flex-direction": "column",
+    gap: "3px",
+  } as const;
+
+  return (
+    <Show when={shouldShow()}>
+      <Show
+        when={!isLoading()}
+        fallback={
+          <div style={containerStyle}>
+            <div
+              style={{
+                "font-size": "0.6rem",
+                color: "var(--text-muted)",
+                opacity: "0.6",
+                "text-align": "center",
+                padding: "2px 0",
+              }}
+            >
+              Loading activity…
+            </div>
+          </div>
+        }
+      >
+        <Show
+          when={hasAnything()}
+          fallback={
+            <Show when={props.showEmpty}>
+              <div style={containerStyle}>
+                <div
+                  style={{
+                    "font-size": "0.6rem",
+                    color: "var(--text-muted)",
+                    opacity: "0.5",
+                    "text-align": "center",
+                    padding: "2px 0",
+                  }}
+                >
+                  No activity data for this window
+                </div>
+              </div>
+            </Show>
+          }
+        >
+          <div style={containerStyle}>
+            {/* Model prediction */}
+            <Show when={pred()}>
+              <div
+                style={{
+                  display: "flex",
+                  "align-items": "center",
+                  gap: "4px",
+                  "font-size": "0.65rem",
+                }}
+              >
+                <span style={{ color: "var(--text-muted)" }}>
+                  {pred()!.provenance === "manual" ? "Label:" : "Model:"}
+                </span>
+                <span
+                  style={{
+                    color: LABEL_COLORS[pred()!.mapped_label ?? pred()!.label] ?? "var(--text)",
+                    "font-weight": "600",
+                  }}
+                >
+                  {pred()!.mapped_label || pred()!.label}
+                </span>
+                <span style={{ color: "var(--text-muted)" }}>
+                  ({Math.round(pred()!.confidence * 100)}%)
+                </span>
+              </div>
+            </Show>
+
+            {/* Top apps: prefer AW live, fall back to feature-derived */}
+            <Show when={hasApps()}>
+              <div
+                style={{
+                  display: "flex",
+                  "align-items": "center",
+                  gap: "6px",
+                  "flex-wrap": "wrap",
+                  "font-size": "0.6rem",
+                }}
+              >
+                <Show
+                  when={hasAwApps()}
+                  fallback={
+                    <For each={featureApps()}>
+                      {(entry) => (
+                        <span
+                          style={{
+                            display: "inline-flex",
+                            "align-items": "center",
+                            gap: "2px",
+                            padding: "1px 5px",
+                            "border-radius": "8px",
+                            background: "var(--surface)",
+                            border: "1px solid var(--border)",
+                            color: "var(--text-muted)",
+                          }}
+                        >
+                          <span style={{ "font-weight": "600", color: "var(--text)" }}>
+                            {shortAppName(entry.app_id)}
+                          </span>
+                          {entry.buckets}m
+                        </span>
+                      )}
+                    </For>
+                  }
+                >
+                  <For each={(awApps() ?? []).slice(0, 3)}>
+                    {(entry) => (
+                      <span
+                        style={{
+                          display: "inline-flex",
+                          "align-items": "center",
+                          gap: "2px",
+                          padding: "1px 5px",
+                          "border-radius": "8px",
+                          background: "var(--surface)",
+                          border: "1px solid var(--border)",
+                          color: "var(--text-muted)",
+                        }}
+                      >
+                        <span style={{ "font-weight": "600", color: "var(--text)" }}>
+                          {shortAppName(entry.app)}
+                        </span>
+                        {entry.events}
+                      </span>
+                    )}
+                  </For>
+                </Show>
+              </div>
+            </Show>
+
+            {/* Input stats + coverage */}
+            <Show when={hasStats() || hasCoverage()}>
+              <div
+                style={{
+                  display: "flex",
+                  "align-items": "center",
+                  gap: "8px",
+                  "font-size": "0.6rem",
+                  color: "var(--text-muted)",
+                  "flex-wrap": "wrap",
+                }}
+              >
+                <Show when={fmtRate(features()!.mean_keys_per_min)}>
+                  {(v) => <span>keys {v()}/m</span>}
+                </Show>
+                <Show when={fmtRate(features()!.mean_clicks_per_min)}>
+                  {(v) => <span>clicks {v()}/m</span>}
+                </Show>
+                <Show when={fmtRate(features()!.mean_scroll_per_min)}>
+                  {(v) => <span>scroll {v()}/m</span>}
+                </Show>
+                <Show when={hasCoverage()}>
+                  <span style={{ color: "var(--text-muted)", opacity: "0.7" }}>
+                    {features()!.total_buckets}m
+                    <Show when={features()!.session_count > 1}>
+                      {" "}/ {features()!.session_count} sessions
+                    </Show>
+                  </span>
+                </Show>
+              </div>
+            </Show>
+          </div>
+        </Show>
+      </Show>
+    </Show>
+  );
+};

{taskclf-0.2.2 → taskclf-0.2.3}/src/taskclf/ui/frontend/src/components/LabelGrid.tsx

@@ -62,6 +62,7 @@ export const LabelGrid: Component<LabelGridProps> = (props) => {
   const [customValue, setCustomValue] = createSignal("");
   const [customUnit, setCustomUnit] = createSignal<TimeUnit>("m");
   const [extendFwd, setExtendFwd] = createSignal(loadExtendForward());
+  const [confPercent, setConfPercent] = createSignal(100);
 
   function toggleExtendFwd() {
     const next = !extendFwd();
@@ -100,6 +101,7 @@ export const LabelGrid: Component<LabelGridProps> = (props) => {
         start_ts: start.toISOString().slice(0, -1),
         end_ts: now.toISOString().slice(0, -1),
         label,
+        confidence: confPercent() / 100,
         extend_forward: extendFwd(),
       });
       setFlash(label);
@@ -358,6 +360,53 @@ export const LabelGrid: Component<LabelGridProps> = (props) => {
         </span>
       </div>
 
+      <div
+        style={{
+          display: "flex",
+          "align-items": "center",
+          "justify-content": "center",
+          gap: "6px",
+          "margin-bottom": "6px",
+        }}
+      >
+        <span
+          style={{
+            "font-size": "0.7rem",
+            color: "var(--text-muted)",
+            "flex-shrink": "0",
+          }}
+        >
+          Confidence
+        </span>
+        <input
+          type="range"
+          min="0"
+          max="100"
+          step="5"
+          value={confPercent()}
+          onInput={(e) => setConfPercent(parseInt(e.currentTarget.value))}
+          style={{
+            flex: "1",
+            height: "4px",
+            "max-width": "120px",
+            "accent-color": "var(--accent)",
+            cursor: "pointer",
+          }}
+        />
+        <span
+          style={{
+            "font-size": "0.7rem",
+            "font-weight": confPercent() < 100 ? "700" : "500",
+            color: confPercent() < 100 ? "var(--text)" : "var(--text-muted)",
+            "min-width": "30px",
+            "text-align": "right",
+            "flex-shrink": "0",
+          }}
+        >
+          {confPercent()}%
+        </span>
+      </div>
+
       <ActivityContext minutes={selectedMinutes} prediction={props.prediction} />
 
       <Show when={flash()}>
@@ -405,17 +454,20 @@ export const LabelGrid: Component<LabelGridProps> = (props) => {
         </For>
       </div>
 
-      <Show when={lastLabel()}>
-        <div
-          style={{
-            "text-align": "center",
-            "font-size": "0.65rem",
-            color: "var(--text-muted)",
-            "margin-top": "6px",
-            "margin-bottom": "2px",
-            "padding-top": "4px",
-            "border-top": "1px solid var(--border)",
-          }}
+      <div
+        style={{
+          "text-align": "center",
+          "font-size": "0.65rem",
+          color: "var(--text-muted)",
+          "margin-top": "6px",
+          "margin-bottom": "2px",
+          "padding-top": "4px",
+          "border-top": "1px solid var(--border)",
+        }}
+      >
+        <Show
+          when={lastLabel()}
+          fallback={<span style={{ color: "var(--text-muted)" }}>No labels yet</span>}
         >
           Last:{" "}
           <span
@@ -427,8 +479,8 @@ export const LabelGrid: Component<LabelGridProps> = (props) => {
             {lastLabel()!.label}
           </span>{" "}
           {timeAgo(lastLabel()!.end_ts)}
-        </div>
-      </Show>
+        </Show>
+      </div>
     </div>
   );
 };