Merge branch 'dev/0.5.3' into 'main'

Dev/0.5.3

See merge request computer-vision/kwplot!23

Author: Erotemic

.gitlab-ci.yml

@@ -497,7 +497,7 @@ deploy/wheels:
     done
   - |-
     # Have the server git-tag the release and push the tags
-    export VERSION=$(python -c "import setup; print(setup.VERSION)")
+    export PROJECT_VERSION=$(python -c "import setup; print(setup.VERSION)")
     # do sed twice to handle the case of https clone with and without a read token
     URL_HOST=$(git remote get-url origin | sed -e 's|https\?://.*@||g' | sed -e 's|https\?://||g' | sed -e 's|git@||g' | sed -e 's|:|/|g')
     source dev/secrets_configuration.sh
@@ -509,37 +509,74 @@ deploy/wheels:
         git config user.email "ci@gitlab.org.com"
         git config user.name "Gitlab-CI"
     fi
-    TAG_NAME="v${VERSION}"
+    TAG_NAME="v${PROJECT_VERSION}"
     echo "TAG_NAME = $TAG_NAME"
     if [ $(git tag -l "$TAG_NAME") ]; then
         echo "Tag already exists"
     else
         # if we messed up we can delete the tag
         # git push origin :refs/tags/$TAG_NAME
         # and then tag with -f
-        git tag $TAG_NAME -m "tarball tag $VERSION"
+        git tag $TAG_NAME -m "tarball tag $PROJECT_VERSION"
         git push --tags "https://git-push-token:${PUSH_TOKEN}@${URL_HOST}"
     fi
   - |-
     # https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
-    echo "CI_PROJECT_URL=$CI_PROJECT_URL"
     echo "CI_PROJECT_ID=$CI_PROJECT_ID"
     echo "CI_PROJECT_NAME=$CI_PROJECT_NAME"
-    echo "CI_PROJECT_NAMESPACE=$CI_PROJECT_NAMESPACE"
     echo "CI_API_V4_URL=$CI_API_V4_URL"
 
     export PROJECT_VERSION=$(python -c "import setup; print(setup.VERSION)")
     echo "PROJECT_VERSION=$PROJECT_VERSION"
 
     # --header "PRIVATE-TOKEN: $PRIVATE_GITLAB_TOKEN" \
+
+    # We will loop over all of the assets in the wheelhouse (i.e.
+    # dist) and upload them to a package registery. We also store
+    # the links to the artifacts so we can attach them to a release
+    # page.
+    PACKAGE_ARTIFACT_ARRAY=()
     for FPATH in "dist"/*; do
         FNAME=$(basename $FPATH)
         echo $FNAME
+        PACKAGE_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/$CI_PROJECT_NAME/$PROJECT_VERSION/$FNAME"
         curl \
             --header "JOB-TOKEN: $CI_JOB_TOKEN" \
             --upload-file $FPATH \
-            "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/$CI_PROJECT_NAME/$PROJECT_VERSION/$FNAME"
+            "$PACKAGE_URL"
+        PACKAGE_ARTIFACT_ARRAY+=("$PACKAGE_URL")
     done
+  - |-
+    export PROJECT_VERSION=$(python -c "import setup; print(setup.VERSION)")
+    echo "PROJECT_VERSION=$PROJECT_VERSION"
+    TAG_NAME="v$PROJECT_VERSION"
+
+    # Construct the JSON for assets to attach to the release
+    RELEASE_ASSET_JSON_LINKS=()
+    for ASSET_URL in "${PACKAGE_ARTIFACT_ARRAY[@]}"; do
+        ASSET_FNAME=$(basename $ASSET_URL)
+        RELEASE_ASSET_JSON_LINKS+=("{\"name\": \"$ASSET_FNAME\", \"url\": \"$ASSET_URL\"},")
+    done
+    _ASSET_LINK_JSON="${RELEASE_ASSET_JSON_LINKS[@]}"
+    # remove the trailing comma
+    ASSET_LINK_JSON=${_ASSET_LINK_JSON::-1}
+    echo "ASSET_LINK_JSON=$ASSET_LINK_JSON"
+
+    # Build json describing the release
+    RELEASE_DATA_JSON="{
+        \"name\": \"Version $PROJECT_VERSION\",
+        \"description\": \"Automated release of $CI_PROJECT_NAME version $PROJECT_VERSION\",
+        \"tag_name\": \"$TAG_NAME\",
+        \"assets\": {\"links\": [$ASSET_LINK_JSON]}
+    }"
+    echo "$RELEASE_DATA_JSON"
+
+    curl \
+        --header 'Content-Type: application/json' \
+        --header "PRIVATE-TOKEN: $PRIVATE_GITLAB_TOKEN" \
+        --data "$RELEASE_DATA_JSON" \
+        --request POST \
+        "$CI_API_V4_URL/projects/$CI_PROJECT_ID/releases"
 
 
 # end

CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## Version 0.5.3 - Unreleased
 
+### Fix
+* Fixed `ffmpeg_animate_frames` to handle paths and ndarrays
+
+### Added
+* Add Palette class
+* Add relabel argument to FigureManager to automatically relabel on finalize
+
 
 ## Version 0.5.2 - Released 2024-09-09
 

kwplot/__init__.py

@@ -286,6 +286,7 @@ def __getattr__(name):
         ],
         'util_seaborn': [
             'MonkeyPatchPyPlotFigureContext',
+            'Palette',
         ],
     },
 )

kwplot/cli/adjust_gui.py

@@ -32,6 +32,14 @@ class AdjustGuiConfig(scfg.DataConfig):
     Helper to find good robust normalization parameters for input images.
     """
     img_fpath = scfg.Value(None, help='input', position=1)
+    scaling = 'sigmoid'
+    extrema = 'quantile'
+    low = 0.1
+    mid = 0.5
+    high =  0.9
+    crop = scfg.Value("null", type=str, help='A crop string e.g. y1:y2, x1:x2')
+    expr = scfg.Value("null", type=str)
+    cmap = scfg.Value('None', type=str)
 
 
 def report_thread_error(fn):
@@ -179,7 +187,7 @@ def qt_is_editable(self):
 
     def qt_set_value(self, data):
         # TODO: casting
-        data = smartcast_mod.smartcast(data)
+        data = smartcast_mod.smartcast(data, allow_split=False)
         self.value = data
 
     def qt_delegate_style(self):
@@ -224,11 +232,18 @@ class QConfigNode(ub.NiceRepr, _Qt_ConfigNodeMixin):
         >>>         'opt1': 1,
         >>>         'opt2': 2,
         >>>     },
-        >>>     'general_opt': 'abc',
+        >>>     'general_opt1': 'abc',
+        >>>     'general_opt2': 'abc,efg',
         >>> }
         >>> self = QConfigNode.from_indexable(config)
         >>> print('self = {}'.format(ub.urepr(self, nl=1)))
-        >>> print(self.to_indexable())
+        >>> config = self.to_indexable()
+        >>> print(f'config = {ub.urepr(config, nl=1)}')
+        >>> self.children['general_opt2'].qt_set_value('fds,fds')
+        >>> assert self.children['general_opt2'].value == 'fds,fds'
+        >>> config = self.to_indexable()
+        >>> print(f'config = {ub.urepr(config, nl=1)}')
+        >>> assert config['general_opt2'] == 'fds,fds'
     """
 
     def __init__(self, value=NoValue, type=None, parent=None, choices=None,
@@ -538,7 +553,14 @@ class QConfigModel(QtCore.QAbstractItemModel):
         >>> pindex = root_config.children['algo1'].qt_get_persistant_index(self)
         >>> index = QtCore.QModelIndex(pindex)
         >>> self.setData(index, 'foo')
-        >>> self.data(index)
+        >>> got_value = self.data(index)  # why does this not return foo?
+        >>> config = self.root_config.to_indexable()
+        >>> print(f'config = {ub.urepr(config, nl=1)}')
+        >>> assert config['algo1'] == 'foo'
+        >>> self.setData(index, 'foo,bar')
+        >>> config = self.root_config.to_indexable()
+        >>> print(f'config = {ub.urepr(config, nl=1)}')
+        >>> assert config['algo1'] == 'foo,bar'
     """
     @report_thread_error
     def __init__(self, root_config, parent=None):
@@ -911,6 +933,7 @@ class AdjustWidget(QtWidgets.QWidget):
     def __init__(self, config=None, raw_img=None):
         super().__init__()
         self.raw_img = raw_img
+        self.processed_img = raw_img
         self.config = QConfigNode.coerce(config)
 
         main_layout = QtWidgets.QVBoxLayout(self)
@@ -941,10 +964,38 @@ def update_normalization(self, key=None):
         from geowatch.cli.coco_spectra import _weighted_auto_bins
         import pandas as pd
 
-        params = self.config.to_indexable()
         print('Update Norm')
+        params = self.config.to_indexable()
         print('params = {}'.format(ub.urepr(params, nl=1)))
-        norm_img, norm_info = kwarray.robust_normalize(self.raw_img, params=params, return_info=True)
+
+        norm_param_names = {
+            'scaling', 'extrema', 'low', 'mid', 'high'
+        }
+
+        cropstr = params.get('crop', 'null')
+        sl = parse_cropstr(cropstr)
+        if sl is not None:
+            self.processed_img = self.raw_img[sl]
+        else:
+            self.processed_img = self.raw_img
+
+        expr = params.get('expr', 'img')
+        if expr == 'null' or not expr:
+            expr = None
+        if expr is not None:
+            # Hack: not safe
+            img = self.processed_img
+            ns = globals() | locals()
+            self.processed_img = eval(expr, ns)
+            # self.processed_img = ns['img']
+
+        normalizer_params = ub.udict(params) & norm_param_names
+        norm_img, norm_info = kwarray.robust_normalize(self.processed_img, params=normalizer_params, return_info=True)
+
+        processed_stats = kwarray.stats_dict(self.processed_img)
+        norm_stats = kwarray.stats_dict(norm_img)
+        print(f'processed_stats = {ub.urepr(processed_stats, nl=1)}')
+        print(f'norm_stats = {ub.urepr(norm_stats, nl=1)}')
 
         self.norm_img = norm_img
         self.norm_info = norm_info
@@ -954,13 +1005,23 @@ def update_normalization(self, key=None):
         fig = self.mpl_widget.fig
 
         fig.clf()
-        ax1 = fig.add_subplot(1, 2, 1)
-        ax2 = fig.add_subplot(1, 2, 2)
-
-        ax1.imshow(self.norm_img)
+        nSubplots = 2
+        SHOW_NORM_HIST = True
+        if SHOW_NORM_HIST:
+            nSubplots += 1
+        ax1 = fig.add_subplot(1, nSubplots, 1)
+        ax2 = fig.add_subplot(1, nSubplots, 2)
+        if SHOW_NORM_HIST:
+            ax3 = fig.add_subplot(1, nSubplots, 3)
+
+        imshow_params = {}
+        cmap = params.get('cmap', None)
+        if cmap is not None and cmap.lower() not in {'null', 'none'}:
+            imshow_params['cmap'] = cmap
+        ax1.imshow(self.norm_img, **imshow_params)
         ax1.grid(False)
 
-        counts, bins = np.histogram(self.raw_img, bins=256)
+        counts, bins = np.histogram(self.processed_img, bins=256)
         centers = (bins[1:] + bins[0:-1]) / 2
         data = pd.DataFrame({'value': centers, 'weight': counts})
         n_equal_bins = _weighted_auto_bins(data, 'value', 'weight')
@@ -994,6 +1055,21 @@ def update_normalization(self, key=None):
         ax2.plot([mid_val, mid_val], [ymin, ymax], '-', color='blue')
         ax2.plot([max_val, max_val], [ymin, ymax], '-', color='blue')
 
+        if SHOW_NORM_HIST:
+            counts, bins = np.histogram(self.norm_img, bins=256)
+            centers = (bins[1:] + bins[0:-1]) / 2
+            data = pd.DataFrame({'value': centers, 'weight': counts})
+            n_equal_bins = _weighted_auto_bins(data, 'value', 'weight')
+            hist_data_kw = dict(
+                x='value',
+                weights='weight',
+                bins=n_equal_bins,
+            )
+            hist_style_kw = dict(
+            )
+            hist_data_kw_ = hist_data_kw.copy()
+            sns.histplot(ax=ax3, data=data, **hist_data_kw_, **hist_style_kw)
+
         fig.canvas.draw()
 
     def on_mpl_widget_click(self, event):
@@ -1007,7 +1083,7 @@ def on_mpl_widget_click(self, event):
         keys = ['low', 'mid', 'high']
         qarr = [config.children[k].value for k in keys]
 
-        raw_data = self.raw_img.ravel().copy()
+        raw_data = self.processed_img.ravel().copy()
         raw_data.sort()
 
         clicked_percentile = stats.percentileofscore(raw_data, event.xdata)
@@ -1025,6 +1101,56 @@ def on_mpl_widget_click(self, event):
             model.setData(index, clicked_quantile)
 
 
+def parse_cropstr(cropstr, error_policy='return-none'):
+    """
+    Parse a string of the form R1:R2,C1:C2 into a tuple of slices using regex.
+
+    Args:
+        cropstr: A string specifying row and column ranges in format "R1:R2,C1:C2"
+                (empty values mean unbounded, e.g. "10:, :20" means from 10 to end,
+                and from beginning to 20)
+
+    Returns:
+        A tuple of slice objects (row_slice, col_slice)
+
+    Example:
+        >>> # xdoctest: +REQUIRES(module:PyQt5)
+        >>> parse_cropstr("null")
+        None
+        >>> parse_cropstr("")
+        (slice(None, None, None), slice(None, None, None))
+        >>> parse_cropstr("10:20,30:40")
+        (slice(10, 20), slice(30, 40))
+        >>> parse_cropstr(":20,30:")
+        (slice(None, 20), slice(30, None))
+    """
+    import re
+    if not cropstr.strip():
+        return (slice(None), slice(None))
+
+    # Regex pattern to match either:
+    # 1. empty string (treated as full slice)
+    # 2. a single number (e.g. "5" becomes 5:6)
+    # 3. a range with start:end (either can be empty)
+    pattern = r'^\s*((?P<r1>\d*):(?P<r2>\d*))\s*,\s*((?P<c1>\d*):(?P<c2>\d*))\s*$'
+
+    match = re.fullmatch(pattern, cropstr)
+    if not match:
+        if error_policy == 'return-none':
+            return None
+        raise ValueError(f"Invalid crop string format: '{cropstr}'. Expected 'R1:R2,C1:C2'")
+
+    def to_int_or_none(s):
+        return int(s) if s else None
+
+    r1 = to_int_or_none(match.group('r1'))
+    r2 = to_int_or_none(match.group('r2'))
+    c1 = to_int_or_none(match.group('c1'))
+    c2 = to_int_or_none(match.group('c2'))
+
+    return (slice(r1, r2), slice(c1, c2))
+
+
 def main(cmdline=1, **kwargs):
     config = AdjustGuiConfig.cli(cmdline=cmdline, data=kwargs, strict=True)
     print('config = ' + ub.urepr(dict(config), nl=1))
@@ -1046,11 +1172,14 @@ def main(cmdline=1, **kwargs):
         raw_img = kwimage.grab_test_image()
 
     config = {
-        'scaling': QConfigNode('sigmoid', choices=['sigmoid', 'linear']),
-        'extrema': QConfigNode('quantile', choices=['quantile', 'adaptive-quantile', 'iqr', 'iqr-clip']),
-        'low': QConfigNode(0.1, min_value=0.0, max_value=1.0, step_value=0.01),
-        'mid': QConfigNode(0.5, min_value=0.0, max_value=1.0, step_value=0.01),
-        'high': QConfigNode(0.9, min_value=0.0, max_value=1.0, step_value=0.01),
+        'scaling': QConfigNode(config.scaling, choices=['sigmoid', 'linear']),
+        'extrema': QConfigNode(config.extrema, choices=['quantile', 'adaptive-quantile', 'iqr', 'iqr-clip']),
+        'low': QConfigNode(config.low, min_value=0.0, max_value=1.0, step_value=0.01),
+        'mid': QConfigNode(config.mid, min_value=0.0, max_value=1.0, step_value=0.01),
+        'high': QConfigNode(config.high, min_value=0.0, max_value=1.0, step_value=0.01),
+        'crop': QConfigNode(config.crop),
+        'expr': QConfigNode(config.expr),
+        'cmap': QConfigNode(config.cmap),
     }
 
     widget = AdjustWidget(config, raw_img)

kwplot/cli/gifify.py

@@ -23,7 +23,8 @@ class Gifify(scfg.DataConfig):
 
     image_list = scfg.Value(None, required=True, help=ub.paragraph(
             '''
-            list of images (or a text file containing a list of images)
+            a list of images, a text file containing a list of images, or a
+            directory containing a list of images.
             '''), position=1, nargs='*', alias=['input'])
     delay = scfg.Value(10, type=float, short_alias=['d'], help='delay between frames', nargs=1)
     output = scfg.Value('auto', short_alias=['o'], help=ub.paragraph(