pikobs 3.0.332__py3-none-any.whl → 3.0.334__py3-none-any.whl

pikobs/obstimedb/obstimedb.py

@@ -303,6 +303,24 @@ def create_table_if_not_exists(cursor: sqlite3.Cursor) -> None:
 
 
 def combine(pathfileout: str, filememory: str) -> None:
+    # Made idempotent: DELETE any existing rows in the target for the
+    # SAME date(s) about to be inserted, before inserting. Without this,
+    # re-running the extraction for a date already in the accumulator
+    # (a retried/resumed job, or two separate --datestart/--dateend runs
+    # with an overlapping date range writing to the same output db)
+    # silently DUPLICATES that date's rows -- confirmed directly:
+    # extracting the same file twice into the same accumulator produced
+    # the SAME (date, id_stn) row twice, doubling every downstream sum
+    # for that date (and, since different runs can overlap different
+    # date spans by different amounts, this produces INCONSISTENT
+    # inflation across periods -- e.g. Today off by one factor, This
+    # week by another -- rather than one uniform, easy-to-spot scale
+    # error). This delete makes a re-run REPLACE that date's data
+    # instead of stacking a duplicate on top of it.
+    delete_sql = """
+        DELETE FROM moyenne
+        WHERE date IN (SELECT DISTINCT date FROM this_avg_db.moyenne);
+    """
     insert_sql = """
         INSERT INTO moyenne (Nobsdata, Nobsprofile, avg_omp, avg_oma, id_stn, channel, date)
         SELECT Nobsdata, Nobsprofile, avg_omp, avg_oma, id_stn, channel, date
@@ -315,6 +333,7 @@ def combine(pathfileout: str, filememory: str) -> None:
             create_table_if_not_exists(conn)
 
             conn.execute(f"ATTACH DATABASE '{filememory}' AS this_avg_db;")
+            conn.execute(delete_sql)
             conn.execute(insert_sql)
             conn.commit()
             conn.execute("DETACH DATABASE this_avg_db;")

pikobs/obstimedb/obstimedb_plot.py

@@ -459,6 +459,11 @@ def _draw_profile_summary_table(df_all, run_time, name_in='experience'):
             'DIFF_10DAY': _calc_pct_diff(at_run, tenday_avg),
         }
 
+    # Grand-total row: FAMILY='ALL', ID_STN='ALL', summing across EVERY
+    # family and station combined -- matches the reference report's own
+    # first row exactly (it puts this ahead of the per-family rows).
+    rows.append(_build_row('ALL', 'ALL', df_all))
+
     for family, g_fam in df_all.groupby('family', sort=False):
         for id_stn, g_stn in g_fam.groupby('id_stn', sort=False):
             rows.append(_build_row(family, id_stn, g_stn))
@@ -499,14 +504,27 @@ def _draw_profile_summary_table(df_all, run_time, name_in='experience'):
              "</tr>")
     body_rows = []
     for _, r in df_summary.iterrows():
-        row_style = "background:#f5f7ff;font-weight:bold;" if r['ID_STN'] == 'ALL' else ""
-        if r['ID_STN'] == 'ALL':
+        is_grand_total = (r['FAMILY'] == 'ALL' and r['ID_STN'] == 'ALL')
+        if is_grand_total:
+            row_style = "background:#dbe4f7;font-weight:bold;border-top:2px solid #4C72B0;"
+        elif r['ID_STN'] == 'ALL':
+            row_style = "background:#f5f7ff;font-weight:bold;"
+        else:
+            row_style = ""
+        if is_grand_total:
+            # No single section corresponds to "every family combined" --
+            # nothing meaningful to jump to, so this row isn't clickable.
+            onclick_attr = ""
+        elif r['ID_STN'] == 'ALL':
             target = f"#family-{_safe_anchor(r['FAMILY'])}"
+            row_style += "cursor:pointer;"
+            onclick_attr = f" onclick=\"location.href='{target}'\""
         else:
             target = f"#station-{_safe_anchor(r['FAMILY'])}-{_safe_anchor(r['ID_STN'])}"
-        row_style += "cursor:pointer;"
+            row_style += "cursor:pointer;"
+            onclick_attr = f" onclick=\"location.href='{target}'\""
         body_rows.append(
-            f"<tr style='{row_style}' onclick=\"location.href='{target}'\">"
+            f"<tr style='{row_style}'{onclick_attr}>"
             f"<td data-v='{r['FAMILY']}'>{r['FAMILY']}</td>"
             f"<td data-v='{r['ID_STN']}'>{r['ID_STN']}</td>"
             f"<td data-v='{r['NB_TODAY']}'>{_fmt_int(r['NB_TODAY'])}</td>"
@@ -703,13 +721,46 @@ def _draw_channel_mosaic(df_chan_stn, family, stn, region, flag_criteria,
     # the HTML note can say how many cycles this affected.
     n_gap_cycles = int(np.all(np.isnan(grid), axis=0).sum())
 
-    fig_w = _shared_fig_width(n_date)
+    # Every OTHER chart in this report (mosaic, global time series,
+    # per-station time series) uses left=0.06/right=0.99 of
+    # _shared_fig_width(n_date) for its plot area -- no colorbar to eat
+    # into that. This chart has a colorbar, which (via the old
+    # `fig.colorbar(im, ax=ax, fraction=.., pad=..)` approach) SHRINKS
+    # the main axes to make room, so the DATA columns end up narrower
+    # and don't line up pixel-for-pixel with every other chart's columns
+    # despite the total figure width matching. Fix: reserve a FIXED
+    # extra width JUST for the colorbar, and place the main axes
+    # explicitly at the same absolute left/right (in inches) as every
+    # other chart, so the colorbar never touches that space.
+    base_fig_w = _shared_fig_width(n_date)
+    cbar_w_inches = 0.9
+    fig_w = base_fig_w + cbar_w_inches
     fig_h = max(3.0, min(0.18 * n_chan, 40)) + 1.4
-    fig, ax = plt.subplots(figsize=(fig_w, fig_h))
+
+    # Margins reserved in roughly FIXED inches (title ~0.5", hierarchical
+    # x-axis labels ~1.5"), converted to a fraction of THIS figure's own
+    # height -- a plain fixed fraction is fine for a short mosaic but
+    # wastes enormous whitespace on a tall one (300+ channels can make
+    # fig_h > 40"), since the x-axis labels need the same few inches
+    # regardless of how tall the figure is.
+    top_frac = max(0.80, 1.0 - 0.5 / fig_h)
+    bottom_frac = min(0.28, 1.5 / fig_h)
+
+    left_frac = (0.06 * base_fig_w) / fig_w
+    plot_right_frac = (0.99 * base_fig_w) / fig_w   # main axes ends here
+    cbar_left_frac = plot_right_frac + (0.10 / fig_w)
+    cbar_width_frac = 0.18 / fig_w
+
+    fig = plt.figure(figsize=(fig_w, fig_h))
+    ax = fig.add_axes([left_frac, bottom_frac, plot_right_frac - left_frac,
+                       top_frac - bottom_frac])
     cmap = plt.get_cmap('viridis').copy()
     cmap.set_bad(color='#D9D9D9')  # explicit grey for NaN, not blank/white
     im = ax.imshow(grid, aspect='auto', cmap=cmap, interpolation='nearest')
-    cbar = fig.colorbar(im, ax=ax, fraction=0.02, pad=0.01)
+
+    cbar_ax = fig.add_axes([cbar_left_frac, bottom_frac, cbar_width_frac,
+                            top_frac - bottom_frac])
+    cbar = fig.colorbar(im, cax=cbar_ax)
     cbar.set_label('Nobs', fontsize=9)
 
     # Keep channel labels readable even with many channels: thin them
@@ -726,15 +777,6 @@ def _draw_channel_mosaic(df_chan_stn, family, stn, region, flag_criteria,
         title += f'  (grey = no channel data, {n_gap_cycles} cycle{"s" if n_gap_cycles != 1 else ""})'
     ax.set_title(title, fontsize=11)
 
-    # Margins reserved in roughly FIXED inches (title ~0.5", hierarchical
-    # x-axis labels ~1.5"), converted to a fraction of THIS figure's own
-    # height -- a plain fixed fraction (e.g. bottom=0.28) is fine for a
-    # short mosaic but wastes enormous whitespace on a tall one (300+
-    # channels can make fig_h > 40"), since the x-axis labels need the
-    # same few inches regardless of how tall the figure is.
-    top_frac = max(0.80, 1.0 - 0.5 / fig_h)
-    bottom_frac = min(0.28, 1.5 / fig_h)
-    fig.subplots_adjust(left=0.08, right=0.94, top=top_frac, bottom=bottom_frac)
     fig.savefig(out_path, dpi=70)
     plt.close(fig)
     return out_path, n_gap_cycles
@@ -818,18 +860,24 @@ def _draw_station_full_timeseries(df_stn, stn, family, region, flag_criteria,
     stn_col = _stn_color(stn)
 
     fig, ax = plt.subplots(figsize=(fig_w, 4.6))
-    ax.plot(df_stn['_x'], df_stn['Nobs'], marker='o', markersize=4,
-            linestyle='-', linewidth=1.6, color=REF_COLOR, label='Nobs',
-            zorder=2)
-
-    for tier, label in ((STATUS_DARKGREEN, 'Above baseline'),
+    ax.axhline(0.0, color='red', lw=1.0, ls='-', alpha=0.65, zorder=1)
+    ax.plot(df_stn['_x'], df_stn['Nobs'], linestyle='-', linewidth=1.6,
+            color=REF_COLOR, zorder=2)
+
+    # Every point gets a marker in its OWN status colour (not just the
+    # alert-worthy tiers) -- green for normal, dark green for above
+    # baseline, yellow/orange/red for the drop tiers, grey for
+    # insufficient history -- so the curve communicates status at a
+    # glance along its whole length, the same colour scheme as the
+    # mosaic above it, not just where something's flagged.
+    for tier, label in ((STATUS_GREEN, 'Normal'), (STATUS_DARKGREEN, 'Above baseline'),
                         (STATUS_YELLOW, 'Yellow'), (STATUS_ORANGE, 'Orange'),
-                        (STATUS_RED, 'Red')):
+                        (STATUS_RED, 'Red'), (STATUS_GREY, 'Insufficient history')):
         pts = df_stn[df_stn['status'] == tier]
         if not pts.empty:
-            ax.scatter(pts['_x'], pts['Nobs'], marker='o', s=55,
+            ax.scatter(pts['_x'], pts['Nobs'], marker='o', s=40,
                       color=_STATUS_COLORS[tier], edgecolor='#333',
-                      linewidth=0.7, zorder=3, label=label)
+                      linewidth=0.6, zorder=3, label=label)
 
     n_alerts = int(df_stn['status'].isin([STATUS_YELLOW, STATUS_ORANGE, STATUS_RED]).sum())
     ax.set_ylabel('Nobs', fontsize=13, fontweight='bold')

{pikobs-3.0.332.dist-info → pikobs-3.0.334.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pikobs
-Version: 3.0.332
+Version: 3.0.334
 Summary: pikobs
 Home-page: https://gitlab.science.gc.ca/dlo001/pikobs
 Author: David Lobon

{pikobs-3.0.332.dist-info → pikobs-3.0.334.dist-info}/RECORD

@@ -42,8 +42,8 @@ pikobs/obscutoff/__init__.py,sha256=zBvprGRCin9W3w6_k-SZLJ-p-lZa82cqXr1aDIti-UE,
 pikobs/obscutoff/obscutoff.py,sha256=z78FWocYD8QZus6z5X4tQ738__K5q8_RxzngEm9N0iQ,40238
 pikobs/obscutoff/obscutoff_plot.py,sha256=AiqPI6IvViuzoVQzia9NK97lDHtsqcn0newN8MRjojQ,37858
 pikobs/obstimedb/__init__.py,sha256=0-sYoNyHDzRGXT1mzbU5Ek0hSGGlUXn84yx7lvE3qVk,56
-pikobs/obstimedb/obstimedb.py,sha256=LQYwCV3rm5tJQZKj5hd9y7MH_D2TqJ2AEEFmM0nuXOM,27668
-pikobs/obstimedb/obstimedb_plot.py,sha256=1JZyZZzPW-dUfPMGUoWx9fM-DRaHVeXchm9RVlB4J-4,68771
+pikobs/obstimedb/obstimedb.py,sha256=AIqHlV9T1Oy5mH_ShQbfcuJImaSXnTwQwkazE_nBiiY,28787
+pikobs/obstimedb/obstimedb_plot.py,sha256=zqca_CsyGyPDLbqrvUrviaIPu8rsmu2ZoMZa9pu6Q9w,71268
 pikobs/pbs_submit/__init__.py,sha256=atE3cvhxT_mLdd7RFpRQEIicE0rhoqNMm1bqMtckqmA,26
 pikobs/pbs_submit/pbs_submit.py,sha256=UT8mZnLtCo2xSKW8IZVOsON2x_jIPjBTcpId5RTF6zo,9562
 pikobs/pikobsburp2rdb/__init__.py,sha256=gGD_XwalMfcunOvTeN4ogtTqBdL5HSOfdWhy6zdIr8E,31
@@ -73,7 +73,7 @@ pikobs/web/viewer.py,sha256=EZsFajvuyIcEoIcqnUAJ65gvqLgq69jqtGjUd4_RZIE,23372
 pikobs/zone/__init__.py,sha256=3crOJs1I5hf34SkRFtmDCXWwdAoYGuL52gG8QWuiN1Y,45
 pikobs/zone/zone.py,sha256=UtwUYKZgw9u6OKn2gRFw2m3Th8ChqMFkiO4OOG9FLrA,54443
 pikobs/zone/zone_plot.py,sha256=epESi90eeoofrqVDCkhjY6QMEyuH1WWbiPjAmNPwWe0,26773
-pikobs-3.0.332.dist-info/METADATA,sha256=acD_bePcLiOXWxmwgCLBibBRWne5ec-5hQErZhBHF5c,1059
-pikobs-3.0.332.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-pikobs-3.0.332.dist-info/top_level.txt,sha256=UAWCWWUoD-o_b3nFqEG6V0_v37qzVY7i_BPRhfMdnJ0,7
-pikobs-3.0.332.dist-info/RECORD,,
+pikobs-3.0.334.dist-info/METADATA,sha256=XcfRaAIAdhzzPLJ6_Yf0NtZjtRtsk_3EIo-GJf3fzgc,1059
+pikobs-3.0.334.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+pikobs-3.0.334.dist-info/top_level.txt,sha256=UAWCWWUoD-o_b3nFqEG6V0_v37qzVY7i_BPRhfMdnJ0,7
+pikobs-3.0.334.dist-info/RECORD,,