Skip to content

Develop #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 20, 2023
Merged

Develop #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb7c279
Fix bug schema rbbox, ellipse
LeoEATLinden Jul 12, 2023
067af74
Removed code from other branch
LeoEATLinden Jul 12, 2023
2c82924
Update pyproject.toml
LeoEATLinden Jul 12, 2023
21fb1d5
Update pyproject.toml
LeoEATLinden Jul 12, 2023
46c90ab
Merge pull request #7 from superannotateai/schema_fix
LeoEATLinden Jul 12, 2023
011eafc
Update pyproject.toml
VaghinakDev Jul 12, 2023
31265f2
Update pyproject.toml
VaghinakDev Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[project]

name = "superannotate_databricks_connector" # Required
name = "superannotate_databricks_connector"

version = "0.0.1"
version = "0.0.2dev1"

description = "Custom functions to work with SuperAnnotate in Databricks"

readme = "README.md"
readme = "readme.md"

requires-python = ">=3.8"

Expand Down
4 changes: 2 additions & 2 deletions src/superannotate_databricks_connector/schemas/shapes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def get_rbbox_schema():
StructField("x3", FloatType(), True),
StructField("y3", FloatType(), True),
StructField("x4", FloatType(), True),
StructField("y5", FloatType(), True)
StructField("y4", FloatType(), True)
])


Expand Down Expand Up @@ -95,7 +95,7 @@ def get_ellipse_schema():
StructField("cx", FloatType(), True),
StructField("cy", FloatType(), True),
StructField("rx", FloatType(), True),
StructField("ty", FloatType(), True),
StructField("ry", FloatType(), True),
StructField("angle", FloatType(), True)
])

Expand Down
73 changes: 0 additions & 73 deletions src/superannotate_databricks_connector/schemas/video_schema.py
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tests/test_data/upload_data/grape_detection/CDY_2015.jpg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"metadata": {"height": 1365, "width": 2048, "name": "CDY_2015.jpg", "lastAction": {"email": "satenik@superannotate.com", "timestamp": 1686080909922}, "projectId": 129671, "isPredicted": false, "status": "Skipped", "pinned": false, "annotatorEmail": null, "qaEmail": null}, "instances": [], "comments": [], "tags": []}
1 change: 1 addition & 0 deletions tests/test_data/upload_data/grape_detection/CDY_2016.jpg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"metadata": {"height": 1365, "width": 2048, "name": "CDY_2016.jpg", "lastAction": {"email": "oscar@superannotate.com", "timestamp": 1688562794392}, "projectId": 129671, "isPredicted": false, "status": "InProgress", "pinned": false, "annotatorEmail": null, "qaEmail": null}, "instances": [{"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1172.94, "x2": 1317.53, "y1": 472.77, "y2": 718.44}, "groupId": 0, "pointLabels": {}, "locked": true, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.561Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.561Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1494.4, "x2": 1693.63, "y1": 677.37, "y2": 929.78}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": true, "createdAt": "2023-04-03T10:48:48.561Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-21T13:58:54.331Z", "updatedBy": {"email": "leo@superannotate.com", "role": "Admin"}, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1305.28, "x2": 1538.77, "y1": 3.95, "y2": 509.11}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": true, "createdAt": "2023-04-03T10:48:48.561Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-05-29T13:37:55.595Z", "updatedBy": {"email": "leo@superannotate.com", "role": "Admin"}, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1466.86, "x2": 1619.75, "y1": 167.07, "y2": 462.5}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.561Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-05-11T19:34:33.333Z", "updatedBy": {"email": "satenik@superannotate.com", "role": "Admin"}, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 704, "x2": 920.9, "y1": 783.61, "y2": 1237.03}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": true, "createdAt": "2023-04-03T10:48:48.561Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-06-12T13:20:49.923Z", "updatedBy": {"email": "leo@superannotate.com", "role": "Admin"}, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 829.63, "x2": 1023.61, "y1": 586.13, "y2": 943.57}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.561Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.561Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 981.08, "x2": 1218.37, "y1": 232.77, "y2": 648.6}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "trackingId": null, "error": false, "createdAt": "2023-05-29T13:37:06.204Z", "createdBy": {"email": "leo@superannotate.com", "role": "Admin"}, "creationType": "Manual", "updatedAt": "2023-07-05T13:13:14.392Z", "updatedBy": {"role": "Admin", "email": "oscar@superannotate.com"}, "className": "CDY"}, {"type": "polygon", "classId": 1576711, "points": [1067, 224, 1059, 229, 1053, 244, 1031, 257, 1022, 271, 1022, 291, 1036.17, 302.19, 1045.81, 305.4, 1050.3, 319.53, 1040, 319, 1022, 320, 1016, 324, 1012, 332, 1006, 357, 1009, 377, 1002, 387, 1000, 395, 1004, 408, 1001, 437, 1008, 454, 1008, 461, 996, 473, 994, 480, 997, 489, 1002, 494, 1012, 498, 1026, 499, 1031, 505, 1021, 540, 1021, 550, 1025, 561, 1025, 570, 1021, 581, 1024, 594, 1036, 604, 1058, 606, 1069, 616, 1077, 617, 1100, 608, 1129, 609, 1135, 605, 1138, 586, 1151, 568, 1157, 540, 1182, 518, 1184, 496, 1188, 485, 1206, 476, 1212, 469, 1214, 458, 1209, 445, 1209, 437, 1214, 425, 1215, 412, 1209, 389, 1215, 372, 1216, 340, 1201, 331, 1183, 309, 1167, 301, 1150, 279, 1141, 276, 1131, 280, 1127, 277, 1132, 260, 1132, 248, 1126, 240, 1113, 235, 1097, 235, 1080, 225], "groupId": 0, "pointLabels": {}, "locked": true, "attributes": [], "error": null, "createdAt": "2023-05-29T13:37:25.539Z", "createdBy": {"email": "leo@superannotate.com", "role": "Admin"}, "creationType": "Manual", "updatedAt": "2023-05-29T13:37:40.406Z", "updatedBy": {"email": "leo@superannotate.com", "role": "Admin"}, "exclude": [], "className": "CDY"}], "comments": [{"correspondence": [{"text": "This is not annotated", "email": "leo@superannotate.com"}], "x": 1098.74, "y": 441.81, "resolved": false, "createdAt": "2023-04-21T13:58:59.854Z", "createdBy": {"email": "leo@superannotate.com", "role": "Admin"}, "creationType": "Manual", "updatedAt": "2023-04-21T13:59:04.377Z", "updatedBy": {"email": "leo@superannotate.com", "role": "Admin"}}, {"correspondence": [{"text": "This bounding box needs to be tighter", "email": "leo@superannotate.com"}], "x": 1360.12, "y": 280.21, "resolved": false, "createdAt": "2023-05-29T13:38:03.180Z", "createdBy": {"email": "leo@superannotate.com", "role": "Admin"}, "creationType": "Manual", "updatedAt": "2023-05-29T13:38:12.492Z", "updatedBy": {"email": "leo@superannotate.com", "role": "Admin"}}], "tags": []}
1 change: 1 addition & 0 deletions tests/test_data/upload_data/grape_detection/CDY_2017.jpg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"metadata": {"height": 1365, "width": 2048, "name": "CDY_2017.jpg", "lastAction": {"email": "satenik@superannotate.com", "timestamp": 1686080932314}, "projectId": 129671, "isPredicted": false, "status": "Completed", "pinned": false, "annotatorEmail": null, "qaEmail": null}, "instances": [{"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 174.9, "x2": 319.9, "y1": 512.01, "y2": 732.05}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": true, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-06-06T19:48:44.628Z", "updatedBy": {"email": "satenik@superannotate.com", "role": "Admin"}, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 441.86, "x2": 573.95, "y1": 723.93, "y2": 906.97}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 654.03, "x2": 773.02, "y1": 678, "y2": 917.96}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 766.98, "x2": 868.97, "y1": 747, "y2": 859.06}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 783.97, "x2": 962.97, "y1": 452.98, "y2": 636.02}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 994, "x2": 1115.03, "y1": 337.97, "y2": 512.97}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1007.92, "x2": 1199, "y1": 633.02, "y2": 896.05}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1302.94, "x2": 1495.04, "y1": 606.06, "y2": 775.05}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1324.03, "x2": 1652.94, "y1": 405, "y2": 684}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1515.01, "x2": 1749.09, "y1": 539.04, "y2": 895.03}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 915.87, "x2": 1114.93, "y1": 716.08, "y2": 1012.01}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1.02, "x2": 37.07, "y1": 741.95, "y2": 851.01}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:48.439Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:48.439Z", "updatedBy": null, "className": "CDY"}], "comments": [{"correspondence": [{"text": "change it", "email": "satenik@superannotate.com"}], "x": 870.62, "y": 560.47, "resolved": false, "createdAt": "2023-06-06T19:48:47.840Z", "createdBy": {"email": "satenik@superannotate.com", "role": "Admin"}, "creationType": "Manual", "updatedAt": "2023-06-06T19:48:52.314Z", "updatedBy": {"email": "satenik@superannotate.com", "role": "Admin"}}], "tags": []}
1 change: 1 addition & 0 deletions .../test_data/upload_data/grape_detection/CDY_20180427_152724818_BURST000_COVER_TOP.jpg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"metadata": {"height": 1536, "width": 2048, "name": "CDY_20180427_152724818_BURST000_COVER_TOP.jpg", "lastAction": {"email": "leo@superannotate.com", "timestamp": 1680679687124}, "projectId": 129671, "isPredicted": false, "status": "InProgress", "pinned": false, "annotatorEmail": null, "qaEmail": null}, "instances": [{"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 128.51, "x2": 325.08, "y1": 366.73, "y2": 652.19}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 309.33, "x2": 577.02, "y1": 510.48, "y2": 675.05}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 312.38, "x2": 615.62, "y1": 562.79, "y2": 862.48}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 619.17, "x2": 833.02, "y1": 476.95, "y2": 773.08}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 801.02, "x2": 1049.91, "y1": 666.41, "y2": 897.52}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 858.92, "x2": 1048.38, "y1": 860.95, "y2": 1186.54}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1118.48, "x2": 1296.76, "y1": 559.24, "y2": 832.51}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1237.33, "x2": 1389.71, "y1": 730.92, "y2": 866.03}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1400.38, "x2": 1568.51, "y1": 682.16, "y2": 908.19}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1361.78, "x2": 1466.92, "y1": 930.54, "y2": 1097.14}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1577.14, "x2": 1801.14, "y1": 715.17, "y2": 1013.33}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1776.76, "x2": 2023.62, "y1": 816.76, "y2": 1149.46}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}, {"type": "bbox", "classId": 1576711, "probability": 100, "points": {"x1": 1922.03, "x2": 2044.95, "y1": 697.91, "y2": 930.54}, "groupId": 0, "pointLabels": {}, "locked": false, "attributes": [], "error": null, "createdAt": "2023-04-03T10:48:50.410Z", "createdBy": null, "creationType": "Preannotation", "updatedAt": "2023-04-03T10:48:50.410Z", "updatedBy": null, "className": "CDY"}], "comments": [], "tags": []}
Loading