Skip to content

Commit a3da71f

Browse files
Merge pull request #5 from Clarifai/setuptools
Use setuptools so the client can be pip-installed.
2 parents 5b9370b + 089054e commit a3da71f

File tree

8 files changed

+26
-5
lines changed

8 files changed

+26
-5
lines changed

README.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ calls are processed without fail.
1919
Installation
2020
---------------------
2121
<pre>
22-
git clone https://github.com/Clarifai/clarifai_api.git
23-
cd clarifai_api
22+
pip install git+git://github.com/Clarifai/Clarifai_py.git
2423
export CLARIFAI_APP_ID=&lt;an_application_id_from_your_account&gt;
2524
export CLARIFAI_APP_SECRET=&lt;an_application_secret_from_your_account&gt;
2625
</pre>
@@ -34,7 +33,7 @@ your local drive:
3433

3534
<pre>
3635

37-
from py.client import ClarifaiApi
36+
from clarifai.client import ClarifaiApi
3837
clarifai_api = ClarifaiApi() # assumes environment variables are set.
3938
result = clarifai_api.tag_images(open('/path/to/local/image.jpeg'))
4039
</pre>
@@ -55,7 +54,7 @@ size per request.
5554

5655
If your images live remotely at a public url, you can also use tag_image_urls:
5756
<pre>
58-
from py.client import ClarifaiApi
57+
from clarifai.client import ClarifaiApi
5958
clarifai_api = ClarifaiApi() # assumes environment variables are set.
6059
result = clarifai_api.tag_image_urls('http://www.clarifai.com/img/metro-north.jpg')
6160
</pre>

__init__.py

Whitespace-only changes.

clarifai/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# For setuptools namespace_packages to be happy:
2+
__import__('pkg_resources').declare_namespace(__name__)

clarifai/client/__init__.py

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from __future__ import absolute_import
2+
3+
from .client import ClarifaiApi, ApiError, ApiThrottledError, ApiBadRequestError
File renamed without changes.
File renamed without changes.

sample_main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import os
44
import sys
55

6-
from client import ClarifaiApi
6+
from clarifai.client import ClarifaiApi
77

88

99
def tag_images_in_directory(path, api):

setup.py

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
try:
2+
from setuptools import setup
3+
except ImportError:
4+
from distutils.core import setup
5+
6+
setup(
7+
description='Clarifai API Python Client',
8+
author='Clarifai',
9+
url='https://github.com/clarifai/clarifai_py',
10+
author_email='[email protected]',
11+
version='0.1',
12+
install_requires=[],
13+
namespace_packages=['clarifai'],
14+
packages=['clarifai.client'],
15+
scripts=[],
16+
name='clarifai-py',
17+
)

0 commit comments

Comments
 (0)