Skip to content

Commit ef2d595

Browse files
committed
1.0.2
1 parent a329b88 commit ef2d595

File tree

5 files changed

+88
-68
lines changed

5 files changed

+88
-68
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,5 @@ cython_debug/
160160
.idea/
161161

162162
.DS_Store
163+
.pre-commit-config.yaml
164+
pyproject.toml

license.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

rocketapi/instagramapi.py

+75-62
Original file line numberDiff line numberDiff line change
@@ -8,142 +8,155 @@ def __init__(self, token, threads=1):
88

99
def request(self, method, data):
1010
response = super().request(method, data)
11-
if response['status'] == 'done':
12-
if response['response']['status_code'] == 200 and response['response']['content_type'] == 'application/json':
13-
return response['response']['body']
14-
elif response['response']['status_code'] == 404:
15-
raise NotFoundException('Instagram resource not found')
11+
if response["status"] == "done":
12+
if (
13+
response["response"]["status_code"] == 200
14+
and response["response"]["content_type"] == "application/json"
15+
):
16+
return response["response"]["body"]
17+
elif response["response"]["status_code"] == 404:
18+
raise NotFoundException("Instagram resource not found")
1619
else:
17-
raise BadResponseException('Bad response from Instagram')
18-
raise BadResponseException('Bad response from RocketAPI')
20+
raise BadResponseException("Bad response from Instagram")
21+
raise BadResponseException("Bad response from RocketAPI")
1922

2023
def search(self, query):
21-
return self.request('instagram/search', {'query': query})
24+
return self.request("instagram/search", {"query": query})
2225

2326
def get_user_info(self, username):
24-
return self.request('instagram/user/get_info', {'username': username})
27+
return self.request("instagram/user/get_info", {"username": username})
2528

2629
def get_user_info_by_id(self, user_id):
27-
return self.request('instagram/user/get_info_by_id', {'id': user_id})
30+
return self.request("instagram/user/get_info_by_id", {"id": user_id})
2831

2932
def get_user_media(self, user_id, count=12, max_id=None):
30-
payload = {'id': user_id, 'count': count}
33+
payload = {"id": user_id, "count": count}
3134
if max_id is not None:
32-
payload['max_id'] = max_id
33-
return self.request('instagram/user/get_media', payload)
35+
payload["max_id"] = max_id
36+
return self.request("instagram/user/get_media", payload)
3437

3538
def get_user_clips(self, user_id, max_id=None):
36-
payload = {'id': user_id}
39+
payload = {"id": user_id}
3740
if max_id is not None:
38-
payload['max_id'] = max_id
39-
return self.request('instagram/user/get_clips', payload)
41+
payload["max_id"] = max_id
42+
return self.request("instagram/user/get_clips", payload)
4043

4144
def get_user_guides(self, user_id, max_id=None):
42-
payload = {'id': user_id}
45+
payload = {"id": user_id}
4346
if max_id is not None:
44-
payload['max_id'] = max_id
45-
return self.request('instagram/user/get_guides', payload)
47+
payload["max_id"] = max_id
48+
return self.request("instagram/user/get_guides", payload)
4649

4750
def get_user_tags(self, user_id, count=12, max_id=None):
48-
payload = {'id': user_id, 'count': count}
51+
payload = {"id": user_id, "count": count}
4952
if max_id is not None:
50-
payload['max_id'] = max_id
51-
return self.request('instagram/user/get_tags', payload)
53+
payload["max_id"] = max_id
54+
return self.request("instagram/user/get_tags", payload)
5255

5356
def get_user_following(self, user_id, count=12, max_id=None):
54-
payload = {'id': user_id, 'count': count}
57+
payload = {"id": user_id, "count": count}
5558
if max_id is not None:
56-
payload['max_id'] = max_id
57-
return self.request('instagram/user/get_following', payload)
59+
payload["max_id"] = max_id
60+
return self.request("instagram/user/get_following", payload)
5861

5962
def search_user_following(self, user_id, query):
60-
return self.request('instagram/user/get_following', {'id': user_id, 'query': query})
63+
return self.request(
64+
"instagram/user/get_following", {"id": user_id, "query": query}
65+
)
6166

6267
def get_user_followers(self, user_id, count=12, max_id=None):
63-
payload = {'id': user_id, 'count': count}
68+
payload = {"id": user_id, "count": count}
6469
if max_id is not None:
65-
payload['max_id'] = max_id
66-
return self.request('instagram/user/get_followers', payload)
70+
payload["max_id"] = max_id
71+
return self.request("instagram/user/get_followers", payload)
6772

6873
def search_user_followers(self, user_id, query):
69-
return self.request('instagram/user/get_followers', {'id': user_id, 'query': query})
74+
return self.request(
75+
"instagram/user/get_followers", {"id": user_id, "query": query}
76+
)
7077

7178
def get_user_stories_bulk(self, user_ids):
72-
return self.request('instagram/user/get_stories', {'ids': user_ids})
79+
return self.request("instagram/user/get_stories", {"ids": user_ids})
7380

7481
def get_user_stories(self, user_id):
7582
return self.get_user_stories_bulk([user_id])
7683

7784
def get_user_highlights(self, user_id):
78-
return self.request('instagram/user/get_highlights', {'id': user_id})
85+
return self.request("instagram/user/get_highlights", {"id": user_id})
7986

8087
def get_user_live(self, user_id):
81-
return self.request('instagram/user/get_live', {'id': user_id})
88+
return self.request("instagram/user/get_live", {"id": user_id})
8289

8390
def get_user_similar_accounts(self, user_id):
84-
return self.request('instagram/user/get_similar_accounts', {'id': user_id})
91+
return self.request("instagram/user/get_similar_accounts", {"id": user_id})
8592

8693
def get_media_info(self, media_id):
87-
return self.request('instagram/media/get_info', {'id': media_id})
94+
return self.request("instagram/media/get_info", {"id": media_id})
95+
96+
def get_media_info_by_shortcode(self, shortcode):
97+
return self.request(
98+
"instagram/media/get_info_by_shortcode", {"shortcode": shortcode}
99+
)
88100

89101
def get_media_likes(self, shortcode, count=12, max_id=None):
90-
payload = {'shortcode': shortcode, 'count': count}
102+
payload = {"shortcode": shortcode, "count": count}
91103
if max_id is not None:
92-
payload['max_id'] = max_id
93-
return self.request('instagram/media/get_likes', payload)
104+
payload["max_id"] = max_id
105+
return self.request("instagram/media/get_likes", payload)
94106

95107
def get_media_comments(self, media_id, can_support_threading=True, min_id=None):
96-
payload = {'id': media_id, 'can_support_threading': can_support_threading}
108+
payload = {"id": media_id, "can_support_threading": can_support_threading}
97109
if min_id is not None:
98-
payload['min_id'] = min_id
99-
return self.request('instagram/media/get_comments', payload)
110+
payload["min_id"] = min_id
111+
return self.request("instagram/media/get_comments", payload)
100112

101113
def get_media_shortcode_by_id(self, media_id):
102-
return self.request('instagram/media/get_shortcode_by_id', {'id': media_id})
114+
return self.request("instagram/media/get_shortcode_by_id", {"id": media_id})
103115

104116
def get_media_id_by_shortcode(self, shortcode):
105-
return self.request('instagram/media/get_id_by_shortcode', {'shortcode': shortcode})
117+
return self.request(
118+
"instagram/media/get_id_by_shortcode", {"shortcode": shortcode}
119+
)
106120

107121
def get_guide_info(self, guide_id):
108-
return self.request('instagram/guide/get_info', {'id': guide_id})
122+
return self.request("instagram/guide/get_info", {"id": guide_id})
109123

110124
def get_location_info(self, location_id):
111-
return self.request('instagram/location/get_info', {'id': location_id})
125+
return self.request("instagram/location/get_info", {"id": location_id})
112126

113127
def get_location_media(self, location_id, page=None, max_id=None):
114-
payload = {'id': location_id}
128+
payload = {"id": location_id}
115129
if page is not None:
116-
payload['page'] = page
130+
payload["page"] = page
117131
if max_id is not None:
118-
payload['max_id'] = max_id
119-
return self.request('instagram/location/get_media', payload)
132+
payload["max_id"] = max_id
133+
return self.request("instagram/location/get_media", payload)
120134

121135
def get_hashtag_info(self, name):
122-
return self.request('instagram/hashtag/get_info', {'name': name})
136+
return self.request("instagram/hashtag/get_info", {"name": name})
123137

124138
def get_hashtag_media(self, name, page=None, max_id=None):
125-
payload = {'name': name}
139+
payload = {"name": name}
126140
if page is not None:
127-
payload['page'] = page
141+
payload["page"] = page
128142
if max_id is not None:
129-
payload['max_id'] = max_id
130-
return self.request('instagram/hashtag/get_media', payload)
143+
payload["max_id"] = max_id
144+
return self.request("instagram/hashtag/get_media", payload)
131145

132146
def get_highlight_stories_bulk(self, highlight_ids):
133-
return self.request('instagram/highlight/get_stories', {'ids': highlight_ids})
147+
return self.request("instagram/highlight/get_stories", {"ids": highlight_ids})
134148

135149
def get_highlight_stories(self, highlight_id):
136150
return self.get_highlight_stories_bulk([highlight_id])
137151

138152
def get_comment_likes(self, comment_id, max_id=None):
139-
payload = {'id': comment_id}
153+
payload = {"id": comment_id}
140154
if max_id is not None:
141-
payload['max_id'] = max_id
142-
return self.request('instagram/comment/get_likes', payload)
155+
payload["max_id"] = max_id
156+
return self.request("instagram/comment/get_likes", payload)
143157

144158
def get_audio_media(self, audio_id, max_id=None):
145-
payload = {'id': audio_id}
159+
payload = {"id": audio_id}
146160
if max_id is not None:
147-
payload['max_id'] = max_id
148-
return self.request('instagram/audio/get_media', payload)
149-
161+
payload["max_id"] = max_id
162+
return self.request("instagram/audio/get_media", payload)

rocketapi/rocketapi.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,10 @@ def __init__(self, token, threads=1):
99
self.max_timeout = 30
1010

1111
def request(self, method, data):
12-
data['_threads'] = self.threads
13-
return requests.post(url=self.base_url + method, json=data, headers={'Authorization': f'Token {self.token}'}, timeout=self.max_timeout).json()
12+
data["_threads"] = self.threads
13+
return requests.post(
14+
url=self.base_url + method,
15+
json=data,
16+
headers={"Authorization": f"Token {self.token}"},
17+
timeout=self.max_timeout,
18+
).json()

setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
setuptools.setup(
55
name="rocketapi",
6-
version="1.0.1",
6+
version="1.0.2",
77
author="RocketAPI",
88
author_email="[email protected]",
99
description="RocketAPI Python SDK",
1010
packages=["rocketapi"],
1111
url="https://github.com/rocketapi-io/rocketapi-python",
12-
download_url="https://github.com/rocketapi-io/rocketapi-python/archive/refs/tags/v1.0.1.tar.gz",
13-
install_requires=["requests"]
12+
download_url="https://github.com/rocketapi-io/rocketapi-python/archive/refs/tags/v1.0.2.tar.gz",
13+
install_requires=["requests"],
1414
)

0 commit comments

Comments
 (0)