Skip to content

Commit

Permalink
Merge branch 'react-django'
Browse files Browse the repository at this point in the history
  • Loading branch information
Shanks0465 committed Aug 28, 2024
2 parents fcf72fc + e6d160d commit 36157a2
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 9 deletions.
5 changes: 3 additions & 2 deletions backend/areas/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from areas import views
from django.conf.urls.static import static
from django.conf import settings
from .views import PublicationViewSet, PublicationFilterOptions, AreaViewSet,NewsViewSet
from .views import PublicationViewSet, PublicationFilterOptions, AreaViewSet,InferenceView

router = DefaultRouter()
router.register(r"datasets", views.DatasetViewSet)
Expand Down Expand Up @@ -40,7 +40,8 @@
"area/<str:area>/",
AreaViewSet.as_view({"get":"list"}),
name="area-list"
)
),
path("inference/",InferenceView.as_view(),name="inference"),
]
# Add static file serving if needed
if settings.DEBUG:
Expand Down
43 changes: 38 additions & 5 deletions backend/areas/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,48 @@

# Create your views here.
from .models import Dataset, Tool, Model,News
from rest_framework import viewsets
from rest_framework import viewsets,status
from .serializers import DatasetSerializer, ToolSerializer, ModelSerializer,NewsSerializer
from rest_framework.decorators import permission_classes
from rest_framework import permissions

from rest_framework.views import APIView

DHRUVA_MODEL_VIEW_URL = "https://api.dhruva.ekstep.ai/services/details/view_service"
DHRUVA_API_KEY = "0aaef7ff-86f3-4bb0-a30b-9f50f3de1a52"

from datetime import datetime
@permission_classes((permissions.AllowAny,))
class InferenceView(APIView):
def post(self, request, format=None):
body = request.data
task = body["task"]
if task=="translation":
INFERENCE_API = "https://api.dhruva.ekstep.ai/services/inference/translation"
inferenceResult = requests.post(INFERENCE_API,headers=
{'x-auth-source': 'API_KEY',
'Authorization': DHRUVA_API_KEY},
json={
"controlConfig": {
"dataTracking": True
},
"config": {
"serviceId": body["serviceId"],
"language": {
"sourceLanguage": body["sourceLanguage"],
"sourceScriptCode": "",
"targetLanguage": body["targetLanguage"],
"targetScriptCode": ""
}
},
"input": [
{
"source": body["input"]
}
]
})

return Response(inferenceResult.json(),status=status.HTTP_200_OK)


class NewsViewSet(viewsets.ModelViewSet):
queryset = News.objects.all()
Expand All @@ -25,8 +58,6 @@ class DatasetViewSet(viewsets.ModelViewSet):
serializer_class = DatasetSerializer




class ModelViewSet(viewsets.ModelViewSet):
queryset = Model.objects.all()
serializer_class = ModelSerializer
Expand All @@ -44,7 +75,7 @@ def retrieve(self, request, *args, **kwargs):
dhruvaModelData = requests.post(DHRUVA_MODEL_VIEW_URL,
headers=
{'x-auth-source': 'API_KEY',
'Authorization': '0aaef7ff-86f3-4bb0-a30b-9f50f3de1a52'},
'Authorization': DHRUVA_API_KEY},
json={'serviceId':modelData["service_id"]}).json()["model"]

languages = dhruvaModelData["languages"]
Expand Down Expand Up @@ -161,3 +192,5 @@ def list(self, request, *args, **kwargs):
publications.sort(key=lambda pub: pub.get("published_on"))

return Response(publications)


4 changes: 2 additions & 2 deletions backend/backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"accept",
"origin",
"authorization",
"ngrok-skip-browser-warning",
)

CSRF_TRUSTED_ORIGINS = ["https://e5e4-91-203-135-89.ngrok-free.app"]

DEBUG_PROPAGATE_EXCEPTIONS = True

0 comments on commit 36157a2

Please sign in to comment.