Merge branch 'main' of https://github.com/gamingflexer/Catalog-Digitization

.github/workflows/file_size_check.yml

@@ -0,0 +1,16 @@
+name: Check file size
+on:     
+  pull_request:
+    branches: [main]
+
+  # to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  sync-to-hub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check large files
+        uses: ActionsDesk/[email protected]
+        with:
+          filesizelimit: 10485760 # this is 10MB so we can sync to HF Spaces

.github/workflows/main.yml

@@ -0,0 +1,23 @@
+name: Sync to Hugging Face hub
+on:
+  push:
+    branches: [main]
+
+  # to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  sync-to-hub:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add remote 
+        env:
+          HF_TOKEN: ${{ secrets.HF_TOKEN }}
+        run: git remote add space https://asach:[email protected]/spaces/asach/Catalog-Digitization
+      - name: Push to hub
+        env:
+          HF_TOKEN: ${{ secrets.HF_TOKEN }}
+        run: git push --force https://asach:[email protected]/spaces/asach/Catalog-Digitization main

.gitignore

@@ -173,3 +173,4 @@ src/app/api/migrations/0005_alter_database_barcode_alter_database_brand_and_more
 src/app/api/migrations/0006_alter_product_barcode_alter_product_brand_and_more.py
 src/app/api/migrations/0007_alter_product_price.py
 src/app/media/images/*
+src/app/api/module/image.ipynb

Dockerfile

@@ -0,0 +1,35 @@
+ARG OPENAI_API_KEY
+ARG SEVER_IP
+
+FROM python:3.9
+
+WORKDIR /code
+
+COPY ./requirements.txt /code/requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+
+# Set up a new user named "user" with user ID 1000
+RUN useradd -m -u 1000 user
+
+# Switch to the "user" user
+USER user
+
+# Set home to the user's home directory
+ENV HOME=/home/user \
+    PATH=/home/user/.local/bin:$PATH \
+    OPENAI_API_KEY=$OPENAI_API_KEY \
+    SEVER_IP=$SEVER_IP 
+
+
+# Set the working directory to the user's home directory
+WORKDIR $HOME/app
+
+# Copy the current directory contents into the container at $HOME/app setting the owner to the user
+COPY --chown=user . $HOME/app
+
+ENV GRADIO_SERVER_NAME=0.0.0.0
+
+EXPOSE 7860
+
+CMD ["python", "src/app2.py"]

README.md

@@ -1,3 +1,12 @@
+---
+title: Catalog Digitization
+emoji: 🚀
+colorFrom: pink
+colorTo: pink
+sdk: docker
+app_port: 7860
+pinned: true
+---
 # Catalog Digitization - BUILD FOR BHARAT Hackathon 2024
 
 ## Introduction
@@ -34,4 +43,4 @@ python manage.py runserver
 - **Django**: Backend framework for managing data operations and interfaces.
 - **Tesseract OCR & Easy OCR & AZURE OCR**: Extracts text from images for digitization.
 - **LLAMA 7B & GPT 3.5**: Large language model for processing text and voice inputs.
-- **Speech Recognition**: Converts voice inputs to text for digitization.
+- **Speech Recognition**: Converts voice inputs to text for digitization.

requirements.txt

@@ -0,0 +1,2 @@
+gradio
+pandas

src/app/api/serializers.py

@@ -1,7 +1,12 @@
 from rest_framework import serializers
-from .models import Product
+from .models import Product,Database
 
 class ProductSerializer(serializers.ModelSerializer):
     class Meta:
         model = Product
         fields = '__all__'
+
+class DatabaseSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Database
+        fields = '__all__'

src/app/api/templates/catalouge.html

@@ -30,7 +30,7 @@
     <nav class="navbar navbar-expand-lg navbar-light bg-light">
         <div class="container">
             <a class="navbar-brand" href="{% url 'index' %}" style="font-weight: bold;">HomePage</a>
-            <a class="navbar-brand" href="http://34.122.223.224:9003/" style="font-weight: bold;">Database</a>
+            <a href="http://34.122.223.224:9003/" class="btn btn-secondary ml-1" target="_blank" style="font-weight: bold;">Database</a>
             <a href="{% url 'add_product_by_image' %}" class="btn btn-primary ml-1" style="padding: 0.5rem 1rem; font-size: 1rem;">Add a Product by Image</a>
         </div>
     </nav>
@@ -58,8 +58,9 @@
                 <p class="card-text">Description: {{ product.parent_category }}</p>
                 <p class="card-text">Brand: {{ product.brand }}</p>
                 <div class="d-flex justify-content-between align-items-center">
-                    <a href="{% url 'product_detail' product.id %}" class="btn btn-primary btn-sm mb-2">View Details</a>
+                    <a href="{% url 'product_detail' product.id %}" class="btn btn-primary btn-sm mb-2">View</a>
                     <a href="{% url 'voice_product_detail' product.id %}" class="btn btn-secondary btn-sm mb-2">Voice Edit</a>
+                    <a href="{% url 'delete_product_api' product.id %}" class="btn btn-danger btn-sm mb-2">Delete</a>
                 </div>
             </div>
         </div>

src/app/api/templates/edit_product.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Edit Product</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
+</head>
+<body>
+    <header>
+        <nav class="navbar navbar-expand-lg navbar-light bg-light">
+            <div class="container">
+                <a class="navbar-brand" href="{% url 'index' %}">Catalogue</a>
+            </div>
+        </nav>
+    </header>
+    <div class="container mt-5">
+        <h1 class="text-center">Edit Product</h1>
+        <form method="post">
+            {% csrf_token %}
+            <div class="form-group">
+                <label for="barcode">Barcode:</label>
+                <input type="text" class="form-control" id="barcode" name="barcode" value="{{ product.barcode }}">
+            </div>
+            <div class="form-group">
+                <label for="brand">Brand:</label>
+                <input type="text" class="form-control" id="brand" name="brand" value="{{ product.brand }}">
+            </div>
+            <div class="form-group">
+                <label for="sub_brand">Sub Brand:</label>
+                <input type="text" class="form-control" id="sub_brand" name="sub_brand" value="{{ product.sub_brand }}">
+            </div>
+            <div class="form-group">
+                <label for="manufacturer">Manufacturer:</label>
+                <input type="text" class="form-control" id="manufacturer" name="manufacturer" value="{{ product.manufacturer }}">
+            </div>
+            <!-- Add similar form fields for other attributes -->
+            <div class="text-center">
+                <button type="submit" class="btn btn-primary">Save</button>
+            </div>
+        </form>
+    </div>
+</body>
+</html>

src/app/api/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from . import views
-from .views import ProductAPIView
+from .views import ProductAPIView,SearchProducts,TotalNumberOfProducts,ProductDetailsById,UpdateProduct
 
 urlpatterns = [
     path('', views.catalouge_page, name='index'),
@@ -9,4 +9,10 @@ urlpatterns = [
     path('product/<int:product_id>/edit/', views.edit_product, name='edit_product'),
     path('upload/', views.upload_image_and_audio, name='add_product_by_image'),
     path('api/products/', ProductAPIView.as_view(), name='product_api'),
+    path('api/delete_product/<int:product_id>/', views.delete_product_api, name='delete_product_api'),
+    
+    path('api/search_products/', SearchProducts.as_view(), name='search_products'),
+    path('api/total_number_of_products/', TotalNumberOfProducts.as_view(), name='total_number_of_products'),
+    path('api/product_details/<int:pk>/', ProductDetailsById.as_view(), name='product_details_by_id'),
+    path('api/update_product/<int:pk>/', UpdateProduct.as_view(), name='update_product'),
 ]

src/app/api/views.py

@@ -6,12 +6,14 @@ from django.shortcuts import render, get_object_or_404
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework import status
-from .models import Product
-from .serializers import ProductSerializer
+from .models import Product,Database
+from .serializers import ProductSerializer,DatabaseSerializer
 from django.http import JsonResponse
 import os
 from config import BASE_PATH
 from api.module.product_description import get_details
+from django.views.decorators.http import require_http_methods
+from django.db.models import Q
 
 def catalouge_page(request):
     # Fetch all products from the database
@@ -41,13 +43,11 @@ def edit_product(request, product_id):
     
     if request.method == 'POST':
         # Update the product fields with the submitted data
+        product = Product.objects.get(pk=product_id)
         product.barcode = request.POST.get('barcode')
         product.brand = request.POST.get('brand')
         product.sub_brand = request.POST.get('sub_brand')
         product.manufacturer = request.POST.get('manufacturer')
-        # Update other fields similarly
-        
-        # Save the updated product
         product.save()
         
         # Redirect to the product page after saving
@@ -130,4 +130,46 @@ def edit_voice_product(request,product_id):
         else:
             return JsonResponse({'error': 'No voice file submitted.'}, status=400)
     else:
-        return render(request, 'edit_voice_product.html')
+        return render(request, 'edit_voice_product.html')
+    
+def delete_product_api(request, product_id):
+    try:
+        product = Product.objects.get(pk=product_id)
+        product.delete()
+        return HttpResponseRedirect(reverse('index'))
+    except Product.DoesNotExist:
+        return JsonResponse({'error': 'Product not found.'}, status=404)
+    
+class SearchProducts(APIView):
+    def get(self, request):
+        name = request.query_params.get('name', '')
+        products = Database.objects.filter(Q(product_name__icontains=name) & Q(description__icontains=name))
+        db_serializer = DatabaseSerializer(products, many=True)
+        return Response(db_serializer.data)
+
+class TotalNumberOfProducts(APIView):
+    def get(self, request):
+        count = Database.objects.count()
+        return Response({"total_number_of_products": count})
+
+class ProductDetailsById(APIView):
+    def get(self, request, pk):
+        try:
+            product = Product.objects.get(pk=pk)
+            product_serializer = ProductSerializer(product)
+            return Response(product_serializer.data)
+        except Product.DoesNotExist:
+            return Response({"error": "Product not found"}, status=404)
+        
+class UpdateProduct(APIView):
+    def put(self, request, pk):
+        try:
+            product = Product.objects.get(pk=pk)
+            serializer = ProductSerializer(product, data=request.data)
+            print(serializer.is_valid(), serializer.errors)
+            if serializer.is_valid():
+                serializer.save()
+                return Response(serializer.data)
+            return Response(serializer.errors, status=400)
+        except Product.DoesNotExist:
+            return Response({"error": "Product not found"}, status=404)

src/app2.py

@@ -0,0 +1,58 @@
+import gradio as gr
+import pandas as pd
+import os
+import requests
+
+OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
+SEVER_IP = os.environ.get("SEVER_IP")
+
+def get_total_number_of_products():
+    response = requests.get(f'{SEVER_IP}/api/total_number_of_products/')
+    if response.status_code == 200:
+        return response.json()['total_number_of_products']
+    else:
+        return "Error fetching total number of products"
+
+def search_products(product_name):
+    response = requests.get(f'{SEVER_IP}/api/search_products/', params={'name': product_name})
+    if response.status_code == 200:
+        return pd.DataFrame(response.json())
+    else:
+        return pd.DataFrame([])  # Return an empty DataFrame in case of an error
+
+def get_product_details_by_id(product_id):
+    response = requests.get(f'{SEVER_IP}/api/product_details/{product_id}/')
+    if response.status_code == 200:
+        return response.json()  # Returns the product details as a dictionary
+    else:
+        return {"error": f"Product with ID {product_id} not found or error occurred."}
+
+def sample_fun(voice_input, prodcut_id):
+    print(prodcut_id)
+    return
+
+with gr.Blocks(theme=gr.themes.Default(primary_hue=gr.themes.colors.red, secondary_hue=gr.themes.colors.pink)) as demo:
+    
+    with gr.Tab("Add Your Image"):
+        voice_input = gr.Audio(label="Upload Audio")
+        prodcut_id = gr.Textbox(label="Enter Product ID")
+        with gr.Row():
+            submit_button_tab_1 = gr.Button("Start")
+            
+    with gr.Tab("Search Catalog"):
+        with gr.Row():
+            total_no_of_products = gr.Textbox(value=str(get_total_number_of_products()),label="Total Products")
+        with gr.Row():
+            embbed_text_search = gr.Textbox(label="Enter Product Name")
+            submit_button_tab_4 = gr.Button("Start")
+        dataframe_output_tab_4 = gr.Dataframe(headers=['id', 'barcode', 'brand', 'sub_brand', 'manufactured_by', 'product_name', 
+                                               'weight', 'variant', 'net_content', 'price', 'parent_category', 
+                                               'child_category', 'sub_child_category', 'images_paths', 'description', 
+                                               'quantity', 'promotion_on_the_pack', 'type_of_packaging', 'mrp'])
+
+
+
+    submit_button_tab_1.click(fn=sample_fun,inputs=[voice_input,prodcut_id])
+    submit_button_tab_4.click(fn=search_products,inputs=[embbed_text_search] ,outputs= dataframe_output_tab_4)
+
+demo.launch()