Skip to content

Commit

Permalink
Merge branch 'newcommands' of https://github.com/roboflow/roboflow-py…
Browse files Browse the repository at this point in the history
…thon into newcommands
  • Loading branch information
tonylampada committed Jan 3, 2024
2 parents bd505d7 + c1cc7a5 commit 3115ae4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion roboflow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

import requests

from roboflow.adapters import rfapi
from roboflow.config import API_URL, APP_URL, DEMO_KEYS, load_roboflow_api_key
from roboflow.core.project import Project
from roboflow.core.workspace import Workspace
from roboflow.models import CLIPModel, GazeModel
from roboflow.util.general import write_line
from roboflow.adapters import rfapi

__version__ = "1.1.14"

Expand Down
3 changes: 1 addition & 2 deletions roboflow/core/workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
import json
import os
import sys
from roboflow.adapters import rfapi


import requests
import supervision as sv
from numpy import ndarray
from PIL import Image
from tqdm import tqdm

from roboflow.adapters import rfapi
from roboflow.config import API_URL, CLIP_FEATURIZE_URL, DEMO_KEYS
from roboflow.core.project import Project
from roboflow.util import folderparser
Expand Down
7 changes: 4 additions & 3 deletions roboflow/roboflowpy.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
#!/usr/bin/env python3
import argparse
import json
import re

import roboflow
import json
from roboflow import config as roboflow_config
from roboflow.models.object_detection import ObjectDetectionModel
from roboflow.adapters import rfapi
from roboflow.config import (
DEFAULT_BATCH_NAME,
APP_URL,
DEFAULT_BATCH_NAME,
get_conditional_configuration_variable,
load_roboflow_api_key,
)
from roboflow.models.object_detection import ObjectDetectionModel


def login(args):
Expand Down

0 comments on commit 3115ae4

Please sign in to comment.