Update widget types (#279)

* Update widget types * debug * update workflow files * Revert "debug" This reverts commit b611bd4.
wildlife-dynamics · Oct 4, 2024 · 9590d4f · 9590d4f
1 parent 3963bb2
commit 9590d4f
Show file tree

Hide file tree

Showing 20 changed files with 681 additions and 679 deletions.
diff --git a/examples/mode-map/ecoscope-workflows-mode-map-workflow/pixi.lock b/examples/mode-map/ecoscope-workflows-mode-map-workflow/pixi.lock
diff --git a/...mode-mapvalues-workflow/ecoscope_workflows_mode_mapvalues_workflow/params-jsonschema.json b/...mode-mapvalues-workflow/ecoscope_workflows_mode_mapvalues_workflow/params-jsonschema.json
@@ -688,10 +688,10 @@
       "properties": {
         "widget_type": {
           "enum": [
-            "plot",
+            "graph",
             "map",
             "text",
-            "single_value"
+            "stat"
           ],
           "title": "Widget Type",
           "type": "string"
@@ -768,10 +768,10 @@
       "properties": {
         "widget_type": {
           "enum": [
-            "plot",
+            "graph",
             "map",
             "text",
-            "single_value"
+            "stat"
           ],
           "title": "Widget Type",
           "type": "string"

diff --git a/...pe-workflows-mode-mapvalues-workflow/ecoscope_workflows_mode_mapvalues_workflow/params.py b/...pe-workflows-mode-mapvalues-workflow/ecoscope_workflows_mode_mapvalues_workflow/params.py
@@ -179,10 +179,10 @@ class NorthArrowStyle(BaseModel):
 
 
 class WidgetType(str, Enum):
-    plot = "plot"
+    graph = "graph"
     map = "map"
     text = "text"
-    single_value = "single_value"
+    stat = "stat"
 
 
 class WidgetSingleView(BaseModel):

diff --git a/examples/mode-mapvalues/ecoscope-workflows-mode-mapvalues-workflow/pixi.lock b/examples/mode-mapvalues/ecoscope-workflows-mode-mapvalues-workflow/pixi.lock
diff --git a/...s-patrol-events-workflow/ecoscope_workflows_patrol_events_workflow/params-jsonschema.json b/...s-patrol-events-workflow/ecoscope_workflows_patrol_events_workflow/params-jsonschema.json
@@ -1656,10 +1656,10 @@
       "properties": {
         "widget_type": {
           "enum": [
-            "plot",
+            "graph",
             "map",
             "text",
-            "single_value"
+            "stat"
           ],
           "title": "Widget Type",
           "type": "string"
@@ -1762,10 +1762,10 @@
       "properties": {
         "widget_type": {
           "enum": [
-            "plot",
+            "graph",
             "map",
             "text",
-            "single_value"
+            "stat"
           ],
           "title": "Widget Type",
           "type": "string"

diff --git a/...cope-workflows-patrol-events-workflow/ecoscope_workflows_patrol_events_workflow/params.py b/...cope-workflows-patrol-events-workflow/ecoscope_workflows_patrol_events_workflow/params.py
@@ -476,10 +476,10 @@ class PlotStyle(BaseModel):
 
 
 class WidgetType(str, Enum):
-    plot = "plot"
+    graph = "graph"
     map = "map"
     text = "text"
-    single_value = "single_value"
+    stat = "stat"
 
 
 class WidgetSingleView(BaseModel):

diff --git a/examples/patrol-events/ecoscope-workflows-patrol-events-workflow/pixi.lock b/examples/patrol-events/ecoscope-workflows-patrol-events-workflow/pixi.lock
diff --git a/examples/patrol-events/test-cases.yaml b/examples/patrol-events/test-cases.yaml
@@ -35,12 +35,12 @@ test1:
       directive: "%B" # (typing.Literal['%a', '%A', '%b', '%B', '%c', '%d', '%f', '%H', '%I', '%j', '%m', '%M', '%p', '%S', '%U', '%w', '%W', '%x', '%X', '%y', '%Y', '%z', '%%'], FieldInfo(annotation=NoneType, required=True, description='A directive for formatting the time data.'))
     # Parameters for 'Patrol Events Colormap' using task `apply_color_map`.
     pe_colormap:
-      input_column_name: "event_type"   # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
-      colormap: "tab20b"  # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
+      input_column_name: "event_type" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
+      colormap: "tab20b" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
       output_column_name: "event_type_colormap"
     # Parameters for 'Create map layer from Patrol Events' using task `create_map_layer`.
     pe_map_layer:
-      layer_style:   # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
+      layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
         layer_type: "point"
         fill_color_column: "event_type_colormap"
         get_radius: 5
@@ -73,19 +73,19 @@ test1:
       title: "Patrol Events Bar Chart" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The title of the widget'))
     # Parameters for 'Create Patrol Events Meshgrid' using task `create_meshgrid`.
     pe_meshgrid:
-      cell_width: 10000  # (<class 'int'>, FieldInfo(annotation=NoneType, required=True, description='The width of a grid cell in meters.'))
-      cell_height: 10000  # (<class 'int'>, FieldInfo(annotation=NoneType, required=True, description='The height of a grid cell in meters.'))
+      cell_width: 10000 # (<class 'int'>, FieldInfo(annotation=NoneType, required=True, description='The width of a grid cell in meters.'))
+      cell_height: 10000 # (<class 'int'>, FieldInfo(annotation=NoneType, required=True, description='The height of a grid cell in meters.'))
     # Parameters for 'Patrol Events Feature Density' using task `calculate_feature_density`.
     pe_feature_density:
-      geometry_type: "point"  # (typing.Literal['point', 'line'], FieldInfo(annotation=NoneType, required=True, description='The geometry type of the provided geodataframe'))
+      geometry_type: "point" # (typing.Literal['point', 'line'], FieldInfo(annotation=NoneType, required=True, description='The geometry type of the provided geodataframe'))
     # Parameters for 'Feature Density Colormap' using task `apply_color_map`.
     fd_colormap:
-      input_column_name: "density"   # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
-      colormap: "YlOrRd"  # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
+      input_column_name: "density" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
+      colormap: "YlOrRd" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
       output_column_name: "density_colormap"
     # Parameters for 'Create map layer from Feature Density' using task `create_map_layer`.
     fd_map_layer:
-      layer_style:  # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
+      layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
         layer_type: "polygon"
         fill_color_column: "density_colormap"
         opacity: 0.4
@@ -102,12 +102,12 @@ test1:
     split_patrol_event_groups: {}
     # Parameters for 'Grouped Patrol Events Colormap' using task `apply_color_map`.
     grouped_pe_colormap:
-      input_column_name: "event_type"   # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
-      colormap: "tab20b"  # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
+      input_column_name: "event_type" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
+      colormap: "tab20b" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
       output_column_name: "event_type_colormap"
     # Parameters for 'Create map layer from grouped Patrol Events' using task `create_map_layer`.
     grouped_pe_map_layer:
-      layer_style:   # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
+      layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
         layer_type: "point"
         fill_color_column: "event_type_colormap"
         get_radius: 5
@@ -136,15 +136,15 @@ test1:
     grouped_pe_pie_widget_merge: {}
     # Parameters for 'Grouped Patrol Events Feature Density' using task `calculate_feature_density`.
     grouped_pe_feature_density:
-      geometry_type: "point"  # (typing.Literal['point', 'line'], FieldInfo(annotation=NoneType, required=True, description='The geometry type of the provided geodataframe'))
+      geometry_type: "point" # (typing.Literal['point', 'line'], FieldInfo(annotation=NoneType, required=True, description='The geometry type of the provided geodataframe'))
     # Parameters for 'Grouped Feature Density Colormap' using task `apply_color_map`.
     grouped_fd_colormap:
-      input_column_name: "density"   # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
-      colormap: "YlOrRd"  # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
+      input_column_name: "density" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
+      colormap: "YlOrRd" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
       output_column_name: "density_colormap"
     # Parameters for 'Create map layer from Feature Density' using task `create_map_layer`.
     grouped_fd_map_layer:
-      layer_style:  # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
+      layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
         layer_type: "polygon"
         fill_color_column: "density_colormap"
         opacity: 0.4
@@ -170,5 +170,5 @@ test1:
       - "widget_type='map', title='Density Map'"
       - "widget_type='map', title='Grouped Patrol Events Map'"
       - "widget_type='map', title='Grouped Density Map'"
-      - "widget_type='plot', title='Patrol Events Bar Chart'"
-      - "widget_type='plot', title='Patrol Events Pie Chart'"
+      - "widget_type='graph', title='Patrol Events Bar Chart'"
+      - "widget_type='graph', title='Patrol Events Pie Chart'"
diff --git a/...ope-workflows-patrols-workflow/ecoscope_workflows_patrols_workflow/params-jsonschema.json b/...ope-workflows-patrols-workflow/ecoscope_workflows_patrols_workflow/params-jsonschema.json
@@ -1848,10 +1848,10 @@
       "properties": {
         "widget_type": {
           "enum": [
-            "plot",
+            "graph",
             "map",
             "text",
-            "single_value"
+            "stat"
           ],
           "title": "Widget Type",
           "type": "string"
@@ -2066,10 +2066,10 @@
       "properties": {
         "widget_type": {
           "enum": [
-            "plot",
+            "graph",
             "map",
             "text",
-            "single_value"
+            "stat"
           ],
           "title": "Widget Type",
           "type": "string"

diff --git a/...patrols/ecoscope-workflows-patrols-workflow/ecoscope_workflows_patrols_workflow/params.py b/...patrols/ecoscope-workflows-patrols-workflow/ecoscope_workflows_patrols_workflow/params.py
@@ -506,10 +506,10 @@ class NorthArrowStyle(BaseModel):
 
 
 class WidgetType(str, Enum):
-    plot = "plot"
+    graph = "graph"
     map = "map"
     text = "text"
-    single_value = "single_value"
+    stat = "stat"
 
 
 class WidgetSingleView(BaseModel):