Merge branch 'develop' of github.com:humanprotocol/human-protocol into kb/3439-report-abuse-form

Author: KirillKirill

packages/apps/faucet/server/package.json

@@ -25,7 +25,7 @@
     "web3": "^4.12.1"
   },
   "devDependencies": {
-    "@types/cors": "^2.8.17",
+    "@types/cors": "^2.8.19",
     "@types/express": "^4.17.14",
     "@types/node": "^22.15.16",
     "concurrently": "^9.1.2",

packages/core/package.json

@@ -79,7 +79,7 @@
     "openpgp": "5.11.2",
     "prettier": "^3.4.2",
     "prettier-plugin-solidity": "^1.3.1",
-    "solidity-coverage": "^0.8.2",
+    "solidity-coverage": "^0.8.16",
     "tenderly": "^0.9.1",
     "ts-node": "^10.9.2",
     "typechain": "^8.3.2",

packages/examples/cvat/exchange-oracle/src/core/tasks/boxes_from_points.py

@@ -8,6 +8,8 @@
 from attrs import frozen
 from datumaro.util import dump_json, parse_json
 
+from src.core.tasks.roi_based import OUTPUT_OBJECT_ID_ATTR
+
 BboxPointMapping = dict[int, int]
 
 
@@ -90,3 +92,14 @@ def parse_roi_info(self, rois_info_data: bytes) -> RoiInfos:
 
     def parse_roi_filenames(self, roi_filenames_data: bytes) -> RoiFilenames:
         return {int(k): v for k, v in parse_json(roi_filenames_data).items()}
+
+
+__all__ = [
+    "OUTPUT_OBJECT_ID_ATTR",
+    "BboxPointMapping",
+    "RoiInfo",
+    "RoiInfos",
+    "RoiFilenames",
+    "TaskMetaLayout",
+    "TaskMetaSerializer",
+]

packages/examples/cvat/exchange-oracle/src/core/tasks/roi_based.py

@@ -0,0 +1 @@
+OUTPUT_OBJECT_ID_ATTR = "object_id"

packages/examples/cvat/exchange-oracle/src/core/tasks/skeletons_from_boxes.py

@@ -9,6 +9,7 @@
 from datumaro.util import dump_json, parse_json
 
 from src.core.config import Config
+from src.core.tasks.roi_based import OUTPUT_OBJECT_ID_ATTR
 
 DEFAULT_ASSIGNMENT_SIZE_MULTIPLIER = Config.core_config.skeleton_assignment_size_mult
 
@@ -133,3 +134,15 @@ def parse_point_labels(self, point_labels_data: bytes) -> PointLabelsMapping:
             (v["skeleton_label"], v["point_label"]): v["job_point_label"]
             for v in parse_json(point_labels_data)
         }
+
+
+__all__ = [
+    "OUTPUT_OBJECT_ID_ATTR",
+    "SkeletonBboxMapping",
+    "RoiInfo",
+    "RoiInfos",
+    "RoiFilenames",
+    "PointLabelsMapping",
+    "TaskMetaLayout",
+    "TaskMetaSerializer",
+]

packages/examples/cvat/exchange-oracle/src/handlers/job_export.py

@@ -262,6 +262,18 @@ def _process_merged_dataset(self, input_dataset: Dataset) -> Dataset:
             ).elements[0]
             old_x, old_y = old_point.points[:2]
 
+            roi_anns = [
+                roi_ann.wrap(
+                    id=roi_info.point_id,
+                    attributes={
+                        **roi_sample.attributes,
+                        boxes_from_points_task.OUTPUT_OBJECT_ID_ATTR: roi_info.point_id,
+                    },
+                )
+                for roi_ann in roi_sample.annotations
+                if isinstance(roi_ann, dm.Bbox)
+            ]
+
             merged_sample.annotations.extend(
                 annotation_utils.shift_ann(
                     roi_ann,
@@ -270,8 +282,7 @@ def _process_merged_dataset(self, input_dataset: Dataset) -> Dataset:
                     img_w=image_w,
                     img_h=image_h,
                 )
-                for roi_ann in roi_sample.annotations
-                if isinstance(roi_ann, dm.Bbox)
+                for roi_ann in roi_anns
             )
 
         return merged_sample_dataset
@@ -456,6 +467,7 @@ def _process_dataset(self, dataset: Dataset, *, ann_descriptor: FileDescriptor)
                     ],
                     label=self.bbox_label_to_merged[old_bbox.label],
                     id=old_bbox.id,
+                    attributes={skeletons_from_boxes_task.OUTPUT_OBJECT_ID_ATTR: old_bbox.id},
                 )
                 skeleton_sample.annotations.append(merged_skeleton)
 

packages/examples/cvat/recording-oracle/src/core/config.py

@@ -177,6 +177,12 @@ class ValidationConfig:
     value small enough for faster convergence rate of the annotation process.
     """
 
+    enable_gt_bans = to_bool(getenv("ENABLE_GT_BANS", "1"))
+    """
+    Whether to allow automatic GT bans for bad images or not. By default, bans are allowed.
+    This can raise escrow annotation chances at the cost of reduced quality threshold.
+    """
+
     unverifiable_assignments_threshold = float(getenv("UNVERIFIABLE_ASSIGNMENTS_THRESHOLD", "0.1"))
     """
     Deprecated. Not expected to happen in practice, kept only as a safety fallback rule.

packages/examples/cvat/recording-oracle/src/handlers/process_intermediate_results.py

@@ -574,7 +574,8 @@ def _get_available_gt(self) -> tuple[GtStats, dict[int, set[GtKey]]]:
             gt_key
             for gt_key, gt_stat in self.gt_stats.items()
             if gt_stat.enabled
-            if gt_stat.rating > 1 - self.manifest.validation.min_quality
+            if not Config.validation.enable_gt_bans
+            or (gt_stat.rating > 1 - self.manifest.validation.min_quality)
         }, task_id_to_gt_keys
 
     def _check_warmup_annotation_speed(self):

yarn.lock

@@ -3909,7 +3909,7 @@ __metadata:
     openpgp: "npm:5.11.2"
     prettier: "npm:^3.4.2"
     prettier-plugin-solidity: "npm:^1.3.1"
-    solidity-coverage: "npm:^0.8.2"
+    solidity-coverage: "npm:^0.8.16"
     tenderly: "npm:^0.9.1"
     ts-node: "npm:^10.9.2"
     typechain: "npm:^8.3.2"
@@ -4049,7 +4049,7 @@ __metadata:
   resolution: "@human-protocol/faucet-server@workspace:packages/apps/faucet/server"
   dependencies:
     "@human-protocol/sdk": "workspace:*"
-    "@types/cors": "npm:^2.8.17"
+    "@types/cors": "npm:^2.8.19"
     "@types/express": "npm:^4.17.14"
     "@types/node": "npm:^22.15.16"
     axios: "npm:^1.3.4"
@@ -9785,12 +9785,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cors@npm:^2.8.17":
-  version: 2.8.17
-  resolution: "@types/cors@npm:2.8.17"
+"@types/cors@npm:^2.8.19":
+  version: 2.8.19
+  resolution: "@types/cors@npm:2.8.19"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10c0/457364c28c89f3d9ed34800e1de5c6eaaf344d1bb39af122f013322a50bc606eb2aa6f63de4e41a7a08ba7ef454473926c94a830636723da45bf786df032696d
+  checksum: 10c0/b5dd407040db7d8aa1bd36e79e5f3f32292f6b075abc287529e9f48df1a25fda3e3799ba30b4656667ffb931d3b75690c1d6ca71e39f7337ea6dfda8581916d0
   languageName: node
   linkType: hard
 
@@ -26726,12 +26726,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"solidity-coverage@npm:^0.8.2":
-  version: 0.8.15
-  resolution: "solidity-coverage@npm:0.8.15"
+"solidity-coverage@npm:^0.8.16":
+  version: 0.8.16
+  resolution: "solidity-coverage@npm:0.8.16"
   dependencies:
     "@ethersproject/abi": "npm:^5.0.9"
-    "@solidity-parser/parser": "npm:^0.19.0"
+    "@solidity-parser/parser": "npm:^0.20.1"
     chalk: "npm:^2.4.2"
     death: "npm:^1.1.0"
     difflib: "npm:^0.2.4"
@@ -26753,7 +26753,7 @@ __metadata:
     hardhat: ^2.11.0
   bin:
     solidity-coverage: plugins/bin.js
-  checksum: 10c0/b97bd862a4c446ad05af359391b6c7084d37c9ac90fee02d07dfd0c972a368fd1ab951e50f686551238b01e8730d2fe52700613ea361e369fa70b83e1cafc86d
+  checksum: 10c0/6a5d643f8cc11c926a898f2bc60720c893634a65d17b1a99f5df32c485ea25404022555c22c66ee85c388e67c96ea8366895111ed592539dd45697e1a6208203
   languageName: node
   linkType: hard