summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunil Shetye2024-06-13 15:51:33 +0530
committerSunil Shetye2024-06-13 15:53:36 +0530
commitcf3d17ad13ecfc1ecfc298afea7ead0f805dfce6 (patch)
tree49313235ffc125c6340bddf4d8dfe5e26a092e5f
parent7f8b290b26e877dbc4a869d96c1889db35f0ae07 (diff)
downloadCommon-Interface-Project-cf3d17ad13ecfc1ecfc298afea7ead0f805dfce6.tar.gz
Common-Interface-Project-cf3d17ad13ecfc1ecfc298afea7ead0f805dfce6.tar.bz2
Common-Interface-Project-cf3d17ad13ecfc1ecfc298afea7ead0f805dfce6.zip
add pillow to requirements.txt
enable saveAPI
-rw-r--r--blocks/authAPI/urls.py2
-rw-r--r--blocks/authAPI/views.py15
-rw-r--r--blocks/blocks/settings.py10
-rw-r--r--blocks/requirements.txt1
-rw-r--r--blocks/simulationAPI/views.py6
5 files changed, 21 insertions, 13 deletions
diff --git a/blocks/authAPI/urls.py b/blocks/authAPI/urls.py
index d9b6c00c..70c09332 100644
--- a/blocks/authAPI/urls.py
+++ b/blocks/authAPI/urls.py
@@ -3,10 +3,8 @@ from authAPI import views as authAPI_views
urlpatterns = [
-
# GitHub OAuth2 callback
url(r'^github-callback', authAPI_views.GitHubOAuth2, name='github-callback'),
-
url(r'^google-callback', authAPI_views.GoogleOAuth2),
url(r'^users/activate/(?P<uid>[\w-]+)/(?P<token>[\w-]+)/$',
authAPI_views.activate_user),
diff --git a/blocks/authAPI/views.py b/blocks/authAPI/views.py
index b782ecbb..0a677748 100644
--- a/blocks/authAPI/views.py
+++ b/blocks/authAPI/views.py
@@ -17,6 +17,7 @@ Token = djoser_settings.TOKEN_MODEL
# Set up logging
logger = logging.getLogger(__name__)
+
def activate_user(request, uid, token):
"""
Used to activate accounts,
@@ -40,7 +41,7 @@ def GoogleOAuth2(request):
code = request.GET.get('code', None)
if state is None or state == '' or code is None or code == '':
- return HttpResponseNotFound("<h1>Page Not Found</h1>")
+ return HttpResponseNotFound('<h1>Page Not Found</h1>')
client_id = settings.SOCIAL_AUTH_GOOGLE_OAUTH2_KEY
client_secret = settings.SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET
@@ -85,7 +86,7 @@ def GitHubOAuth2(request):
code = request.GET.get('code', None)
if state is None or state == '' or code is None or code == '':
- return HttpResponseNotFound("<h1>Page Not Found</h1>")
+ return HttpResponseNotFound('<h1>Page Not Found</h1>')
client_id = settings.SOCIAL_AUTH_GITHUB_KEY
client_secret = settings.SOCIAL_AUTH_GITHUB_SECRET
@@ -102,14 +103,14 @@ def GitHubOAuth2(request):
code=code
)
except Exception as e:
- logger.error(f"Failed to fetch token from GitHub: {e}")
- return HttpResponseNotFound("<h1>Failed to authenticate with GitHub</h1>")
+ logger.error(f'Failed to fetch token from GitHub: {e}')
+ return HttpResponseNotFound('<h1>Failed to authenticate with GitHub</h1>')
try:
user_info = github.get('https://api.github.com/user').json()
except Exception as e:
- logger.error(f"Failed to get user info from GitHub: {e}")
- return HttpResponseNotFound("<h1>Failed to get user info from GitHub</h1>")
+ logger.error(f'Failed to get user info from GitHub: {e}')
+ return HttpResponseNotFound('<h1>Failed to get user info from GitHub</h1>')
primary_email = f"{user_info['id']}+{user_info['login']}@users.noreply.github.com"
@@ -147,7 +148,7 @@ class CustomTokenCreateView(utils.ActionViewMixin, generics.GenericAPIView):
token = utils.login_user(self.request, serializer.user)
token_serializer_class = TokenSerializer
data = {
- 'auth_token': token_serializer_class(token).data["auth_token"],
+ 'auth_token': token_serializer_class(token).data['auth_token'],
'user_id': serializer.user.id
}
return Response(data=data, status=status.HTTP_200_OK)
diff --git a/blocks/blocks/settings.py b/blocks/blocks/settings.py
index e8147235..be0d512e 100644
--- a/blocks/blocks/settings.py
+++ b/blocks/blocks/settings.py
@@ -59,6 +59,7 @@ INSTALLED_APPS = [
'social_django',
'blocks.xcosblocks',
'authAPI',
+ 'saveAPI',
'simulationAPI',
]
@@ -142,7 +143,8 @@ GOOGLE_OAUTH_REDIRECT_URI = os.environ.get('GOOGLE_OAUTH_REDIRECT_URI',
'http://localhost/api/auth/google-callback')
SOCIAL_AUTH_GITHUB_KEY = os.environ.get('SOCIAL_AUTH_GITHUB_KEY', '')
SOCIAL_AUTH_GITHUB_SECRET = os.environ.get('SOCIAL_AUTH_GITHUB_SECRET', '')
-GITHUB_OAUTH_REDIRECT_URI = os.environ.get('GITHUB_OAUTH_REDIRECT_URI', 'http://localhost/api/auth/github-callback')
+GITHUB_OAUTH_REDIRECT_URI = os.environ.get('GITHUB_OAUTH_REDIRECT_URI',
+ 'http://localhost/api/auth/github-callback')
POST_ACTIVATE_REDIRECT_URL = os.environ.get('POST_ACTIVATE_REDIRECT_URL',
'http://localhost/')
DOMAIN = os.environ.get('EMAIL_DOMAIN', 'localhost')
@@ -207,9 +209,13 @@ CORS_ALLOW_CREDENTIALS = True
STATIC_URL = '/django_static/'
+# File Storage
+FILE_STORAGE_ROOT = os.path.join(BASE_DIR, 'file_storage')
+FILE_STORAGE_URL = '/files'
+
# noqa For Netlist handling netlist uploads and other temp uploads
MEDIA_URL = '/_files/'
-MEDIA_ROOT = os.path.join('/tmp', 'blocks-tmp')
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
# celery
CELERY_BROKER_URL = 'redis://redis:6379/1'
diff --git a/blocks/requirements.txt b/blocks/requirements.txt
index 1185120a..85bd5fe0 100644
--- a/blocks/requirements.txt
+++ b/blocks/requirements.txt
@@ -24,6 +24,7 @@ idna==3.7
kombu==5.3.5
mccabe==0.7.0
oauthlib==3.2.2
+pillow==10.3.0
prompt-toolkit==3.0.36
pycodestyle==2.10.0
pycparser==2.22
diff --git a/blocks/simulationAPI/views.py b/blocks/simulationAPI/views.py
index 6daa691c..ee9c6c2a 100644
--- a/blocks/simulationAPI/views.py
+++ b/blocks/simulationAPI/views.py
@@ -61,7 +61,8 @@ class XmlUploader(APIView):
return Response(response_data)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
+
+
class XmlSave(APIView):
'''
API for XmlSave
@@ -94,7 +95,8 @@ class XmlSave(APIView):
with open(filename, 'r') as file:
filecontent = file.read()
- response = Response(filecontent, status=status.HTTP_200_OK, content_type='application/octet-stream')
+ response = Response(filecontent, status=status.HTTP_200_OK,
+ content_type='application/octet-stream')
response['Content-Disposition'] = f'attachment; filename="{os.path.basename(filename)}"'
return response