Skip to content

Commit 3362c6b

Browse files
tonylampadatonylampada
committed
fix stuff
1 parent eea0d61 commit 3362c6b

19 files changed

+56
-44
lines changed

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
"editor.defaultFormatter": "ms-python.black-formatter"
1616
},
1717
"python.formatting.provider": "none",
18-
"python.testing.pytestEnabled": false
18+
"python.testing.pytestEnabled": false,
19+
"editor.inlineSuggest.showToolbar": "onHover"
1920
}

‎roboflow/adapters/rfapi.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import json
12
import os
23
import urllib
3-
import json
4+
45
import requests
56
from requests_toolbelt.multipart.encoder import MultipartEncoder
67

@@ -99,7 +100,9 @@ def save_annotation(
99100

100101
response = requests.post(
101102
upload_url,
102-
data=json.dumps({"data": annotation_string, "labelmap": annotation_labelmap}),
103+
data=json.dumps(
104+
{"annotationFile": annotation_string, "labelmap": annotation_labelmap}
105+
),
103106
headers={"Content-Type": "application/json"},
104107
)
105108
responsejson = None

‎roboflow/roboflowpy.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env python3
22
import argparse
3+
34
import roboflow
45
from roboflow.config import DEFAULT_BATCH_NAME
56

‎roboflow/util/folderparser.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
23
from .image_utils import load_labelmap
34

45
IMAGE_EXTENSIONS = {".jpg", ".jpeg", ".png", ".bmp"}

‎setup.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import re
2+
13
import setuptools
24
from setuptools import find_packages
3-
import re
45

56
with open("./roboflow/__init__.py", "r") as f:
67
content = f.read()

‎tests/manual/debugme.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import sys
21
import os
2+
import sys
33

44
# import requests
55

@@ -10,15 +10,15 @@
1010
os.environ["ROBOFLOW_CONFIG_DIR"] = f"{thisdir}/data/.config"
1111
sys.path.append(rootdir)
1212

13-
from roboflowpy import _argparser
13+
from roboflow.roboflowpy import _argparser
1414

1515
if __name__ == "__main__":
1616
parser = _argparser()
1717
# args = parser.parse_args(["login"])
1818
# args = parser.parse_args(f"upload {thisdir}/../datasets/chess -w wolfodorpythontests -p chess -f auto".split())
1919
args = parser.parse_args(
20-
# f"import {thisdir}/data/cultura-pepino-voc -w wolfodorpythontests -p cultura-pepino-voc -f auto -c 50".split()
21-
f"import {thisdir}/data/cultura-pepino-darknet -w wolfodorpythontests -p cultura-pepino-darknet -f auto -c 100".split()
20+
f"import {thisdir}/data/cultura-pepino-voc -w wolfodorpythontests -p cultura-pepino-voc -f auto -c 50".split()
21+
# f"import {thisdir}/data/cultura-pepino-darknet -w wolfodorpythontests -p cultura-pepino-darknet -f auto -c 100".split()
2222
# f"import {thisdir}/data/0311fisheye -w wolfodorpythontests -p 0311fisheye -f auto -c 50".split()
2323
# f"upload {thisdir}/data/cultura-pepino-darknet/train/10_jpg.rf.2b3a401b0ffd8482e52137ad22faa14f.jpg -a {thisdir}/data/cultura-pepino-darknet/train/10_jpg.rf.2b3a401b0ffd8482e52137ad22faa14f.txt -m {thisdir}/data/cultura-pepino-darknet/train/_darknet.labels -w wolfodorpythontests -p cultura-pepino-darknet -r 3".split()
2424
# f" {thisdir}/data/cultura-pepino-darknet -w wolfodorpythontests -p cultura-pepino-darknet -f auto -c 100".split()

‎tests/manual/download.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
export ROBOFLOW_CONFIG_DIR=./data/.config
2-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f coco -l ./data/cultura-pepino-coco
3-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f yolov5pytorch -l ./data/cultura-pepino-yolov5pytorch
4-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f yolov7pytorch -l ./data/cultura-pepino-yolov7pytorch
5-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f my-yolov6 -l ./data/cultura-pepino-my-yolov6
6-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f darknet -l ./data/cultura-pepino-darknet
7-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f voc -l ./data/cultura-pepino-voc
8-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f tfrecord -l ./data/cultura-pepino-tfrecord
9-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f createml -l ./data/cultura-pepino-createml
10-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f clip -l ./data/cultura-pepino-clip
11-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f multiclass -l ./data/cultura-pepino-multiclass
12-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f coco-segmentation -l ./data/cultura-pepino-coco-segmentation
13-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f yolo5-obb -l ./data/cultura-pepino-yolo5-obb
14-
python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f yolov8 -l ./data/cultura-pepino-yolov8
15-
# python ../../roboflowpy.py download motusbots/cultura-pepino/2 -f png-mask-semantic -l ./data/cultura-pepino-png-mask-semantic
2+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f coco -l ./data/cultura-pepino-coco
3+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f yolov5pytorch -l ./data/cultura-pepino-yolov5pytorch
4+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f yolov7pytorch -l ./data/cultura-pepino-yolov7pytorch
5+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f my-yolov6 -l ./data/cultura-pepino-my-yolov6
6+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f darknet -l ./data/cultura-pepino-darknet
7+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f voc -l ./data/cultura-pepino-voc
8+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f tfrecord -l ./data/cultura-pepino-tfrecord
9+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f createml -l ./data/cultura-pepino-createml
10+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f clip -l ./data/cultura-pepino-clip
11+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f multiclass -l ./data/cultura-pepino-multiclass
12+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f coco-segmentation -l ./data/cultura-pepino-coco-segmentation
13+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f yolo5-obb -l ./data/cultura-pepino-yolo5-obb
14+
python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f yolov8 -l ./data/cultura-pepino-yolov8
15+
# python ../../roboflow/roboflowpy.py download motusbots/cultura-pepino/2 -f png-mask-semantic -l ./data/cultura-pepino-png-mask-semantic

‎tests/manual/import.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export ROBOFLOW_CONFIG_DIR=./data/.config
2-
# python ../../roboflowpy.py import ./data/cultura-pepino-voc -w wolfodorpythontests -p cultura-pepino-upload-test-voc -f voc
3-
# python ../../roboflowpy.py import ./data/cultura-pepino-yolov8 -w wolfodorpythontests -p cultura-pepino-upload-test-yolov8 -f yolov8
4-
python ../../roboflowpy.py import ./data/yellow -w wolfodorpythontests -p yellow-auto -f darknet
5-
# python ../../roboflowpy.py import ./data/cultura-pepino-yolov5pytorch -w wolfodorpythontests -p cultura-pepino-upload-test-yolov5 -f yolov5
6-
# python ../../roboflowpy.py import ./data/0311fisheye -w wolfodorpythontests -p 0311fisheye -f auto
2+
# python ../../roboflow/roboflowpy.py import ./data/cultura-pepino-voc -w wolfodorpythontests -p cultura-pepino-upload-test-voc -f voc
3+
# python ../../roboflow/roboflowpy.py import ./data/cultura-pepino-yolov8 -w wolfodorpythontests -p cultura-pepino-upload-test-yolov8 -f yolov8
4+
python ../../roboflow/roboflowpy.py import ./data/yellow -w wolfodorpythontests -p yellow-auto -f darknet
5+
# python ../../roboflow/roboflowpy.py import ./data/cultura-pepino-yolov5pytorch -w wolfodorpythontests -p cultura-pepino-upload-test-yolov5 -f yolov5
6+
# python ../../roboflow/roboflowpy.py import ./data/0311fisheye -w wolfodorpythontests -p 0311fisheye -f auto

‎tests/manual/login.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export ROBOFLOW_CONFIG_DIR=./data/.config
2-
python ../../roboflowpy.py login
2+
python ../../roboflow/roboflowpy.py login

‎tests/manual/uselocal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
cp data/.config-staging data/.config
23
export API_URL=https://localhost.roboflow.one
34
export APP_URL=https://localhost.roboflow.one
45
# need to set it in /etc/hosts to the IP of host.docker.internal!

0 commit comments

Comments
 (0)