Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Feature/remove rest client from celery" #734

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions bothub/api/v2/internal/connect_rest_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from typing import List, Dict

from django.conf import settings
from django.core.cache import cache


class ConnectRESTClient:
Expand All @@ -28,21 +27,15 @@ def get_auth_token(self) -> str:
def list_classifiers(
self, project_uuid: str, user_email: str
) -> List[Dict[str, str]]:
cache_key = f"LIST_CLASSIFIER_CACHE_KEY:project_uuid:{project_uuid}:user_email:{user_email}"
cache_result = cache.get(cache_key, None)
if cache_result is None:
request = requests.get(
url=f"{self.base_url}/v1/organization/project/list_classifier/",
headers=self.headers,
params={"project_uuid": project_uuid, "user_email": user_email},
)
cache.set(cache_key, request.json().get("data"), settings.CACHE_TTL)
return request.json().get("data")
else:
return cache_result
request = requests.get(
url=f"{self.base_url}/v1/organization/project/list_classifier/",
headers=self.headers,
params={"project_uuid": project_uuid, "user_email": user_email},
)

def list_authorizations(self, project_uuid: str, user_email: str) -> List[str]:
return request.json()["data"]

def list_authorizations(self, project_uuid: str, user_email: str) -> List[str]:
classifiers = self.list_classifiers(
project_uuid=project_uuid, user_email=user_email
)
Expand All @@ -53,7 +46,7 @@ def get_authorization_classifier(
self, project_uuid: str, authorization_uuid: str, user_email: str
) -> str:
"""
Receives a authorization UUID and returns the respective classifier UUID
Recives a authorization UUID and returns the respective classifier UUID
"""
classifiers = self.list_classifiers(project_uuid, user_email)
classifier = filter(
Expand Down
2 changes: 0 additions & 2 deletions bothub/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -626,5 +626,3 @@
]

REPOSITORY_BLOCK_USER_LOGS = env.list("REPOSITORY_BLOCK_USER_LOGS", default=[])

CACHE_TTL = env.int("CACHE_TTL", default=180)