diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..e88d499f --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +/tests/manual/data diff --git a/roboflow/util/folderparser.py b/roboflow/util/folderparser.py index d8755dc3..2dbe49f9 100644 --- a/roboflow/util/folderparser.py +++ b/roboflow/util/folderparser.py @@ -13,6 +13,7 @@ def parsefolder(folder): raise Exception(f"folder does not exist. {folder}") files = _list_files(folder) images = [f for f in files if f["extension"] in IMAGE_EXTENSIONS] + _add_indices(images) _decide_split(images) annotations = [f for f in files if f["extension"] in ANNOTATION_EXTENSIONS] labelmaps = [f for f in files if f["extension"] in LABELMAPS_EXTENSIONS] @@ -45,7 +46,6 @@ def _list_files(folder): file_path = os.path.join(root, file) filedescriptors.append(_describe_file(file_path.split(folder)[1])) filedescriptors = sorted(filedescriptors, key=lambda x: _alphanumkey(x["file"])) - _add_indices(filedescriptors) return filedescriptors diff --git a/tests/manual/debugme.py b/tests/manual/debugme.py index 3a8dd235..060c5e6d 100644 --- a/tests/manual/debugme.py +++ b/tests/manual/debugme.py @@ -19,18 +19,21 @@ args = parser.parse_args( # "download https://universe.roboflow.com/gdit/aerial-airport".split() # "project list -w wolfodorpythontests".split() - # "project get cultura-pepino-dark".split() + # "project get -w wolfodorpythontests cultura-pepino-voc".split() # "workspace list".split() # "workspace get wolfodorpythontests".split() # f"infer -w jacob-solawetz -m rock-paper-scissors-slim/5 -c .01 {thisdir}/data/scissors.png".split() # noqa: E501 // docs # f"infer -w roboflow-6tyri -m usa-states/3 -c .94 -t instance-segmentation {thisdir}/data/unitedstates.jpg".split() # noqa: E501 // docs # f"infer -w naumov-igor-segmentation -m car-segmetarion/2 -t semantic-segmentation {thisdir}/data/car.jpg".split() # noqa: E501 // docs - # f"import {thisdir}/data/cultura-pepino-voc -w wolfodorpythontests -p cultura-pepino-voc -f auto -c 50".split() # noqa: E501 // docs + f"import {thisdir}/data/cultura-pepino-voc-no-annotations -w wolfodorpythontests -p cultura-pepino-voc -f auto -c 100".split() # noqa: E501 // docs + # f"upload {thisdir}/data/cultura-pepino-voc/train/318_jpg.rf.d72edf4b7ebc3b537c48fbc2afe15503.jpg -w wolfodorpythontests -p cultura-pepino-voc".split() # noqa: E501 // docs # f"import {thisdir}/data/cultura-pepino-darknet -w wolfodorpythontests -p cultura-pepino-darknet -f auto -c 100".split() # noqa: E501 // docs # f"import {thisdir}/data/0311fisheye -w wolfodorpythontests -p 0311fisheye -f auto -c 50".split() # noqa: E501 // docs # 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() # noqa: E501 // docs # f"upload -p ordered-uploading {thisdir}/data/ordered-upload/1.jpg".split() - f"import -p ordered-uploading {thisdir}/data/ordered-upload".split() + # f"import -p ordered-uploading {thisdir}/data/ordered-upload".split() + # f"import {thisdir}/data/yellow -w wolfodorpythontests -p yellow-auto -f auto".split() + # f"upload -w wolfodorpythontests -p yellow-auto {thisdir}/data/yellow/minion.jpg".split() # f" {thisdir}/data/cultura-pepino-darknet -w wolfodorpythontests -p cultura-pepino-darknet -f auto -c 100".split() # noqa: E501 // docs ) args.func(args) diff --git a/tests/manual/import.sh b/tests/manual/import.sh index 1e6094a0..f730a6bf 100755 --- a/tests/manual/import.sh +++ b/tests/manual/import.sh @@ -3,6 +3,6 @@ export ROBOFLOW_CONFIG_DIR=./data/.config # python ../../roboflow/roboflowpy.py import ./data/cultura-pepino-voc -w wolfodorpythontests -p cultura-pepino-upload-test-voc -f voc # python ../../roboflow/roboflowpy.py import ./data/cultura-pepino-yolov8 -w wolfodorpythontests -p cultura-pepino-upload-test-yolov8 -f yolov8 -python ../../roboflow/roboflowpy.py import ./data/yellow -w wolfodorpythontests -p yellow-auto -f darknet +python ../../roboflow/roboflowpy.py import ./data/yellow -w wolfodorpythontests -p yellow-auto -f auto # python ../../roboflow/roboflowpy.py import ./data/cultura-pepino-yolov5pytorch -w wolfodorpythontests -p cultura-pepino-upload-test-yolov5 -f yolov5 # python ../../roboflow/roboflowpy.py import ./data/0311fisheye -w wolfodorpythontests -p 0311fisheye -f auto diff --git a/tests/manual/infer.sh b/tests/manual/infer.sh new file mode 100755 index 00000000..28dae380 --- /dev/null +++ b/tests/manual/infer.sh @@ -0,0 +1,4 @@ +#!/bin/env bash + +export ROBOFLOW_CONFIG_DIR=./data/.config +python ../../roboflow/roboflowpy.py infer -w model-eval -m soccer/3 data/yellow/snacks.jpg diff --git a/tests/manual/useprod b/tests/manual/useprod index e24d5537..a291ab8c 100644 --- a/tests/manual/useprod +++ b/tests/manual/useprod @@ -3,3 +3,4 @@ cp data/.config-prod data/.config export API_URL=https://api.roboflow.com export APP_URL=https://app.roboflow.com +export OBJECT_DETECTION_URL=https://detect.roboflow.one diff --git a/tests/manual/usestaging b/tests/manual/usestaging index 8184a1f0..62884490 100644 --- a/tests/manual/usestaging +++ b/tests/manual/usestaging @@ -3,3 +3,4 @@ cp data/.config-staging data/.config export API_URL=https://api.roboflow.one export APP_URL=https://app.roboflow.one +export OBJECT_DETECTION_URL=https://lambda-object-detection.staging.roboflow.com