ocr-service

.github/workflows/solutions-dev.yaml

@@ -1,8 +1,8 @@
 name: Pucar-Install Workflow Solutins-Dev
 on:
-  push:
-   branches:
-     - Solutions-Pipeline
+#  push:
+#   branches:
+#     - Solutions-Pipeline
 #  pull_request:
 #    branches:
 #      - main

.github/workflows/solutions-dpg-qa.yaml

@@ -1,8 +1,8 @@
 name: Pucar-Install Workflow Solutins-dpg-qa
 on:
-#  push:
-#   branches:
-#     - Solutions-Pipeline
+  push:
+   branches:
+     - Solutions-Pipeline
 #  pull_request:
 #    branches:
 #      - main
@@ -149,121 +149,70 @@ jobs:
           helmfile-version: 'v0.150.0'
           helm-plugins: >
             https://github.com/databus23/helm-diff
-
-      - name: Commit Id for Latest Deployment
+      - name: Parse YAML and export as environment variables
+        id: set-env
         run: |
-          git clone https://github.com/pucardotorg/dristi-solutions.git
-          cd dristi-solutions
-          git checkout tags/v0.3.3-uat
-          payment_calculator_commit=$(git log -1 --pretty=format:%H -- backend/payment-calculator-svc)
-          echo "payment_calculator_commit=$payment_calculator_commit" >> $GITHUB_ENV
-          advocate_commit=$(git log -1 --pretty=format:%H -- backend/advocate)
-          echo "advocate_commit=$advocate_commit" >> $GITHUB_ENV
-          case_commit=$(git log -1 --pretty=format:%H -- backend/case)
-          echo "case_commit=$case_commit" >> $GITHUB_ENV
-          casemanagement_commit=$(git log -1 --pretty=format:%H -- backend/casemanagement)
-          echo "casemanagement_commit=$casemanagement_commit" >> $GITHUB_ENV
-          hearing_commit=$(git log -1 --pretty=format:%H -- backend/hearing)
-          echo "hearing_commit=$hearing_commit" >> $GITHUB_ENV
-          dristi_case_pdf_commit=$(git log -1 --pretty=format:%H -- backend/dristi-case-pdf)
-          echo "dristi_case_pdf_commit=$dristi_case_pdf_commit" >> $GITHUB_ENV
-          esign_interceptor_commit=$(git log -1 --pretty=format:%H -- backend/esign-interceptor)
-          echo "esign_interceptor_commit=$esign_interceptor_commit" >> $GITHUB_ENV
-          esign_svc_commit=$(git log -1 --pretty=format:%H -- backend/e-sign-svc)
-          echo "esign_svc_commit=$esign_svc_commit" >> $GITHUB_ENV     
-          epost_tracker_commit=$(git log -1 --pretty=format:%H -- backend/epost-tracker)
-          echo "epost_tracker_commit=$epost_tracker_commit" >> $GITHUB_ENV  
-          transformer_commit=$(git log -1 --pretty=format:%H -- backend/transformer)
-          echo "transformer_commit=$transformer_commit" >> $GITHUB_ENV  
-          order_commit=$(git log -1 --pretty=format:%H -- backend/order)
-          echo "order_commit=$order_commit" >> $GITHUB_ENV
-          evidence_commit=$(git log -1 --pretty=format:%H -- backend/evidence)
-          echo "evidence_commit=$evidence_commit" >> $GITHUB_ENV
-          application_commit=$(git log -1 --pretty=format:%H -- backend/application)
-          echo "application_commit=$application_commit" >> $GITHUB_ENV      
-          scheduler_commit=$(git log -1 --pretty=format:%H -- backend/scheduler-svc)
-          echo "scheduler_commit=$scheduler_commit" >> $GITHUB_ENV
-          summons_svc_commit=$(git log -1 --pretty=format:%H -- backend/summons-svc)
-          echo "summons_svc_commit=$summons_svc_commit" >> $GITHUB_ENV 
-          collection_service_commit=$(git log -1 --pretty=format:%H -- common/collection-services)
-          echo "collection_service_commit=$collection_service_commit" >> $GITHUB_ENV
-          task_commit=$(git log -1 --pretty=format:%H -- backend/task)
-          echo "task_commit=$task_commit" >> $GITHUB_ENV
-          digit_ui_commit=$(git log -1 --pretty=format:%H -- frontend/micro-ui)
-          echo "digit_ui_commit=$digit_ui_commit" >> $GITHUB_ENV
-          analytics_commit=$(git log -1 --pretty=format:%H -- backend/analytics)
-          echo "analytics_commit=$analytics_commit" >> $GITHUB_ENV 
-          individual_commit=$(git log -1 --pretty=format:%H -- common/individual)
-          echo "individual_commit=$individual_commit" >> $GITHUB_ENV
-          inbox_commit=$(git log -1 --pretty=format:%H -- common/inbox)
-          echo "inbox_commit=$inbox_commit" >> $GITHUB_ENV
-          etreasury_commit=$(git log -1 --pretty=format:%H -- backend/treasury-backend)
-          echo "etreasury_commit=$etreasury_commit" >> $GITHUB_ENV
-          epayment_commit=$(git log -1 --pretty=format:%H -- backend/treasury-webpage)
-          echo "epayment_commit=$epayment_commit" >> $GITHUB_ENV
-          sbi_svc_commit=$(git log -1 --pretty=format:%H -- backend/sbi-backend)
-          echo "sbi_svc_commit=$sbi_svc_commit" >> $GITHUB_ENV
-          sbi_ui_commit=$(git log -1 --pretty=format:%H -- backend/sbi-webpage)
-          echo "sbi_ui_commit=$sbi_ui_commit" >> $GITHUB_ENV
-          integration_commit=$(git log -1 --pretty=format:%H -- backend/icops_integration-kerala)
-          echo "integration_commit=$integration_commit" >> $GITHUB_ENV
-          kerala_sms_commit=$(git log -1 --pretty=format:%H -- backend/kerala-sms)
-          echo "kerala_sms_commit=$kerala_sms_commit" >> $GITHUB_ENV
-          billing_service_commit=$(git log -1 --pretty=format:%H -- common/billing-service)
-          echo "billing_service_commit=$billing_service_commit" >> $GITHUB_ENV
-          dristi_pdf_commit=$(git log -1 --pretty=format:%H -- utilities/dristi-pdf)
-          echo "dristi_pdf_commit=$dristi_pdf_commit" >> $GITHUB_ENV
-
+          services=$(yq e '.modules[] | select(.name == "egov") | .services' deploy-as-code/charts/release-chart/dependancy_chart-pucar-v0.3.yaml)
+          
+          # Iterate over each service and export as environment variables
+          echo "$services" | while IFS=":" read -r key value; do
+            # Clean up key and value
+            key=$(echo $key | xargs)
+            value=$(echo $value | xargs)
+          
+            # Export as environment variable
+            echo "${key}=${value}" >> $GITHUB_ENV
+          done
 
       - name: digit deployment
         run: |
           helmfile -l deployment=pucar -f digit-helmfile.yaml apply --include-needs=true \
-           --set scheduler.image.tag=v1.0.0-${{ env.scheduler_commit }} \
-           --set scheduler.initContainers.dbMigration.image.tag=v1.0.0-${{ env.scheduler_commit }} \
-           --set payment-calculator.image.tag=v1.0.0-${{ env.payment_calculator_commit }} \
-           --set payment-calculator.initContainers.dbMigration.image.tag=v1.0.0-${{ env.payment_calculator_commit }} \
-           --set digit-ui.image.tag=v1.0.0-${{ env.digit_ui_commit }} \
-           --set dristi-case-pdf.image.tag=v1.0.0-${{ env.dristi_case_pdf_commit }} \
-           --set dristi-pdf.image.tag=v1.0.0-${{ env.dristi_pdf_commit }} \
-           --set advocate.image.tag=v1.0.0-${{ env.advocate_commit }} \
-           --set advocate.initContainers.dbMigration.image.tag=v1.0.0-${{ env.advocate_commit }} \
-           --set case.image.tag=v1.0.0-${{ env.case_commit }} \
-           --set case.initContainers.dbMigration.image.tag=v1.0.0-${{ env.case_commit }} \
-           --set casemanagement.image.tag=v1.0.0-${{ env.casemanagement_commit }} \
-           --set casemanagement.initContainers.dbMigration.image.tag=v1.0.0-${{ env.casemanagement_commit }} \
-           --set evidence.image.tag=v1.0.0-${{ env.evidence_commit }} \
-           --set evidence.initContainers.dbMigration.image.tag=v1.0.0-${{ env.evidence_commit }} \
-           --set hearing.image.tag=v1.0.0-${{ env.hearing_commit }} \
-           --set hearing.initContainers.dbMigration.image.tag=v1.0.0-${{ env.hearing_commit }} \
-           --set order.image.tag=v1.0.0-${{ env.order_commit }} \
-           --set order.initContainers.dbMigration.image.tag=v1.0.0-${{ env.order_commit }} \
-           --set task.image.tag=v1.0.0-${{ env.task_commit }} \
-           --set task.initContainers.dbMigration.image.tag=v1.0.0-${{ env.task_commit }} \
-           --set billing-service.image.tag=v1.0.0-${{ env.billing_service_commit }} \
-           --set billing-service.initContainers.dbMigration.image.tag=v1.0.0-${{ env.billing_service_commit }} \
-           --set collection-services.image.tag=v1.0.0-${{ env.collection_service_commit }} \
-           --set collection-services.initContainers.dbMigration.image.tag=v1.0.0-${{ env.collection_service_commit }} \
-           --set individual.image.tag=v1.0.0-${{ env.individual_commit }} \
-           --set individual.initContainers.dbMigration.image.tag=v1.0.0-${{ env.individual_commit }} \
-           --set inbox.image.tag=v1.0.0-${{ env.inbox_commit }} \
-           --set e-sign-svc.image.tag=v1.0.0-${{ env.esign_svc_commit }} \
-           --set esign-interceptor.image.tag=v1.0.0-${{ env.esign_interceptor_commit }} \
-           --set application.image.tag=v1.0.0-${{ env.application_commit }} \
-           --set application.initContainers.dbMigration.image.tag=v1.0.0-${{ env.application_commit }} \
-           --set analytics.image.tag=v1.0.0-${{ env.analytics_commit }} \
-           --set epayments.image.tag=v1.0.0-${{ env.epayment_commit }} \
-           --set etreasury.image.tag=v1.0.0-${{ env.etreasury_commit }} \
-           --set etreasury.initContainers.dbMigration.image.tag=v1.0.0-${{ env.etreasury_commit }} \
-           --set sbi-webpage.image.tag=v1.0.0-${{ env.sbi_ui_commit }} \
-           --set sbi-svc.image.tag=v1.0.0-${{ env.sbi_svc_commit }} \
-           --set sbi-svc.initContainers.dbMigration.image.tag=v1.0.0-${{ env.sbi_svc_commit }} \
-           --set epost-tracker.image.tag=v1.0.0-${{ env.epost_tracker_commit }} \
-           --set epost-tracker.initContainers.dbMigration.image.tag=v1.0.0-${{ env.epost_tracker_commit }} \
-           --set summons-svc.image.tag=v1.0.0-${{ env.summons_svc_commit }} \
-           --set summons-svc.initContainers.dbMigration.image.tag=v1.0.0-${{ env.summons_svc_commit }} \
-           --set transformer.image.tag=v1.0.0-${{ env.transformer_commit }} \
-           --set icops-integration.image.tag=v1.0.0-${{ env.integration_commit }} \
-           --set icops-integration.initContainers.dbMigration.image.tag=v1.0.0-${{ env.integration_commit }}  
+           --set scheduler.image.tag=${{ env.scheduler }} \
+           --set scheduler.initContainers.dbMigration.image.tag=${{ env.scheduler }} \
+           --set payment-calculator.image.tag=${{ env.payment-calculator }} \
+           --set payment-calculator.initContainers.dbMigration.image.tag=${{ env.payment-calculator }} \
+           --set digit-ui.image.tag=${{ env.digit-ui }} \
+           --set dristi-case-pdf.image.tag=${{ env.dristi-case-pdf }} \
+           --set dristi-pdf.image.tag=${{ env.dristi-case-pdf }} \
+           --set advocate.image.tag=${{ env.advocate }} \
+           --set advocate.initContainers.dbMigration.image.tag=${{ env.advocate }} \
+           --set case.image.tag=${{ env.case }} \
+           --set case.initContainers.dbMigration.image.tag=${{ env.case }} \
+           --set casemanagement.image.tag=${{ env.casemanagement }} \
+           --set casemanagement.initContainers.dbMigration.image.tag=${{ env.casemanagement }} \
+           --set evidence.image.tag=${{ env.evidence }} \
+           --set evidence.initContainers.dbMigration.image.tag=${{ env.evidence }} \
+           --set hearing.image.tag=${{ env.hearing }} \
+           --set hearing.initContainers.dbMigration.image.tag=${{ env.hearing }} \
+           --set order.image.tag=${{ env.order }} \
+           --set order.initContainers.dbMigration.image.tag=${{ env.order }} \
+           --set task.image.tag=${{ env.task }} \
+           --set task.initContainers.dbMigration.image.tag=${{ env.task }} \
+           --set billing-service.image.tag=${{ env.billing-service }} \
+           --set billing-service.initContainers.dbMigration.image.tag=${{ env.billing-service }} \
+           --set collection-services.image.tag=${{ env.collection-services }} \
+           --set collection-services.initContainers.dbMigration.image.tag=${{ env.collection-services }} \
+           --set individual.image.tag=${{ env.individual }} \
+           --set individual.initContainers.dbMigration.image.tag=${{ env.individual }} \
+           --set inbox.image.tag=${{ env.inbox }} \
+           --set e-sign-svc.image.tag=${{ env.e-sign-svc }} \
+           --set esign-interceptor.image.tag=${{ env.esign-interceptor }} \
+           --set application.image.tag=${{ env.application }} \
+           --set application.initContainers.dbMigration.image.tag=${{ env.application }} \
+           --set analytics.image.tag=${{ env.analytics }} \
+           --set epayments.image.tag=${{ env.epayments }} \
+           --set etreasury.image.tag=${{ env.etreasury }} \
+           --set etreasury.initContainers.dbMigration.image.tag=${{ env.etreasury }} \
+           --set sbi-webpage.image.tag=${{ env.sbi-webpage }} \
+           --set sbi-svc.image.tag=${{ env.sbi-svc }} \
+           --set sbi-svc.initContainers.dbMigration.image.tag=${{ env.sbi-svc }} \
+           --set epost-tracker.image.tag=${{ env.epost-tracker }} \
+           --set epost-tracker.initContainers.dbMigration.image.tag=${{ env.epost_tracker_commit }} \
+           --set summons-svc.image.tag=${{ env.summons-svc }} \
+           --set summons-svc.initContainers.dbMigration.image.tag=${{ env.summons-svc }} \
+           --set transformer.image.tag=${{ env.transformer }} \
+           --set icops-integration.image.tag=${{ env.icops-integration }} \
+           --set icops-integration.initContainers.dbMigration.image.tag=${{ env.icops-integration }}
 
         working-directory: deploy-as-code
         env:

.github/workflows/solutions-qa.yaml

@@ -199,6 +199,8 @@ jobs:
           echo "individual_commit=$individual_commit" >> $GITHUB_ENV
           inbox_commit=$(git log -1 --pretty=format:%H -- common/inbox)
           echo "inbox_commit=$inbox_commit" >> $GITHUB_ENV
+          ocr_service_commit=$(git log -1 --pretty=format:%H -- backend/ocr-service)
+          echo "ocr_service_commit=$ocr_service_commit" >> $GITHUB_ENV
           etreasury_commit=$(git log -1 --pretty=format:%H -- backend/treasury-backend)
           echo "etreasury_commit=$etreasury_commit" >> $GITHUB_ENV
           epayment_commit=$(git log -1 --pretty=format:%H -- backend/treasury-webpage)
@@ -231,6 +233,8 @@ jobs:
            --set advocate.initContainers.dbMigration.image.tag=v1.0.0-${{ env.advocate_commit }} \
            --set case.image.tag=v1.0.0-${{ env.case_commit }} \
            --set case.initContainers.dbMigration.image.tag=v1.0.0-${{ env.case_commit }} \
+           --set ocr-service.image.tag=v1.0.0-${{ env.ocr_service_commit }} \
+           --set ocr-service.initContainers.dbMigration.image.tag=v1.0.0-${{ env.ocr_service_commit }} \
            --set casemanagement.image.tag=v1.0.0-${{ env.casemanagement_commit }} \
            --set casemanagement.initContainers.dbMigration.image.tag=v1.0.0-${{ env.casemanagement_commit }} \
            --set evidence.image.tag=v1.0.0-${{ env.evidence_commit }} \

deploy-as-code/charts/core-services/coreservices-helmfile.yaml

@@ -235,11 +235,11 @@ releases:
         team: "solutions"
       <<: *default
 
-#    - name: e-sign-svc  # Replace with your desired namespace
-#      installed: true
-#      labels:
-#        team: "solutions"
-#      <<: *default
+    - name: e-sign-svc  # Replace with your desired namespace
+      installed: true
+      labels:
+        team: "solutions"
+      <<: *default
 
     - name: esign-interceptor  # Replace with your desired namespace
       installed: true

deploy-as-code/charts/core-services/ocr-service/values.yaml

@@ -17,12 +17,12 @@ initContainers:
     schemaTable: "ocr-service_schema"
     image:
       repository: "pucarsolutionsdev.azurecr.io/pucar_ocr_svc_db"
-      tag: v1.0.0-8d21efdbbb95a1bce3a0555c452a5568cbccf301
+      tag: v1.0.0-43fda1f5471717f3898bc96188ea068a4617ddd7
 
 # Container Configs
 image:
   repository: "pucarsolutionsdev.azurecr.io/pucar_ocr_svc"
-  tag: v1.0.0-8d21efdbbb95a1bce3a0555c452a5568cbccf301
+  tag: v1.0.0-43fda1f5471717f3898bc96188ea068a4617ddd7
   imagePullPolicy: Always
 replicas: "1"
 httpPort: 8080

deploy-as-code/charts/release-chart/dependancy_chart-pucar-v0.3.yaml

@@ -0,0 +1,79 @@
+version: v.0.3
+modules:
+  - name: backbone
+    services:
+      - kafka-kraft
+      - elasticsearch-data
+      - elasticsearch-master
+      - kibana
+      - cert-manager
+      - ingress-nginx
+      - minio
+      - postgresql
+      - redis
+  - name: egov
+    dependencies:
+      - "backbone"
+    services:
+      payment-calculator: v1.0.0-303529ae7bb3dc3dfadb291c0e85e89d4739fbcf
+      advocate: v1.0.0-c0669c8792bf4c6f241b6cc6a719c8029bb9b654
+      case: v1.0.0-8088039074b6c1364a7f1441aa3c8f2ab8dbb9b8
+      casemanagement: v1.0.0-80698b6dc6b2133e5edf1765bb1bcfb141db3fa7
+      hearing: v1.0.0-c0669c8792bf4c6f241b6cc6a719c8029bb9b654
+      dristi-case-pdf: v1.0.0-8a9d6df743aa8543bce4fb9d2ae9ead92ce6f1e3
+      esign-interceptor: v1.0.0-c0669c8792bf4c6f241b6cc6a719c8029bb9b654
+      esign-svc: v1.0.0-c0669c8792bf4c6f241b6cc6a719c8029bb9b654
+      epost-tracker: v1.0.0-c0669c8792bf4c6f241b6cc6a719c8029bb9b654
+      transformer: v1.0.0-166a1ada6ae820e84f1e618fdaa8c207c5d7055d
+      order: v1.0.0-c0669c8792bf4c6f241b6cc6a719c8029bb9b654
+      evidence: v1.0.0-617faac057106d6594cd4fd3d753285979630f68
+      application: v1.0.0-2b592df4832e221818f7d38fcee03561ee9c0e10
+      scheduler: v1.0.0-d16de2bec8fbd1934818a489628079956f575af8
+      summons-svc: v1.0.0-c09e277a92772c3aa401e2d9ca52b0276340165b
+      collection-service: v1.0.0-166a1ada6ae820e84f1e618fdaa8c207c5d7055d
+      task: v1.0.0-d16de2bec8fbd1934818a489628079956f575af8
+      digit-ui: v1.0.0-d16de2bec8fbd1934818a489628079956f575af8
+      analytics: v1.0.0-2cd55ac769b6d0cac96e93742f357bcaeb3c86a2
+      individual: v1.0.0-9f9fff70b3b2782499152458e041075a71e21660
+      inbox: v1.0.0-166a1ada6ae820e84f1e618fdaa8c207c5d7055d
+      etreasury: v1.0.0-166a1ada6ae820e84f1e618fdaa8c207c5d7055d
+      epayment: v1.0.0-166a1ada6ae820e84f1e618fdaa8c207c5d7055d
+      sbi-svc: v1.0.0-5bb8fcf5764b268693051c4ff1d5a7a2faf76278
+      sbi-ui: v1.0.0-b34371b1ccc162470e5b8e751bbdc298e9f495ed
+      integration: v1.0.0-b2394c1c227ce18f13ed7efab510b64fa525c51c
+      kerala-sms: v1.0.0-06a6d016599b5a9169b773330a88760819984459
+      billing-service: v1.0.0-3345f6bb9536054a0050db6a05e88de50a1f6647
+      dristi-pdf: v1.0.0-258701f5d7a9ffbe282fadad6046df0f40a8c772
+      verifyapp: v1.0.0-main-c4ee738-4
+      workbench-ui: court-room-hrms-0e500c0d6a-4
+      user-otp: v1.0.0-74196731f4b617ce06552e04a7a6eda9ffc40509
+      transcription: v1.0.0-dristi-experiment-1
+      sunbirdrc-credential-service: sunbirdrc-mithun-f0d17a4438-103
+      service-request: core-2.9-lts-mvn-check-bbc06901f1-6
+      citizen: v1.10.0-beta-0ad561e837-30
+      audit-service: core-2.9-lts-mvn-check-c33cfe45ab-9
+      egov-accesscontrol: core-2.9-lts-mvn-check-34362a8b87-9
+      egov-apportion-service: v1.0.0-911977062f07eda09758a1bb13daed6eee84b7d1
+      egov-enc-service: core-2.9-lts-mvn-check-c607f2d4de-20
+      egov-filestore: core-2.9-lts-mvn-check-17b905d01d-13
+      egov-hrms: court-room-hrm-changes-691901a842-14
+      egov-idgen: v1.0.0-cb22847c89d65c2a3eae05117108bb28c6eea290
+      egov-indexer: request-external-bug-fix-55924ec05b-63
+      egov-localization: core-2.9-lts-mvn-check-59c2e5ea5b-9
+      egov-location: core-2.9-lts-mvn-check-c33cfe45ab-9
+      egov-mdms-service: v1.0.0-MDMS-v2-2.9LTS-1
+      egov-notification-mail: core-2.9-lts-mvn-check-c33cfe45ab-4
+      egov-otp: core-2.9-lts-mvn-check-72333e5530-5
+      egov-persister: core-2.9-lts-mvn-check-c33cfe45ab-7
+      egov-pg-service: core-2.9-lts-mvn-check-421601fcdf-10
+      egov-url-shortening: core-2.9-lts-mvn-check-ecf5d0a880-11
+      egov-user: v1.0.0-core-2.9-lts-egov-user-deployement-1
+      egov-user-event: core-2.9-lts-mvn-check-57ef3ac8dd-4
+      egov-workflow-v2: core-2.9-lts-mvn-check-07ed8e9a49-12
+      employee: v1.10.0-beta-e7a69e05d3-33
+      gateway: core-2.9-lts-mvn-check-3b9d5c6ad1-20
+      kenlm: v1.0.0-dristi-experiment-1
+      ocr-service: v1.0.0-8d21efdbbb95a1bce3a0555c452a5568cbccf301
+      OCR: v1.0.0-dristi-experiment-OCR-6
+      pdf-service: v1.0.0-90e4e870f2ce81ef35eeed5620ad957260f3d632
+      pgr-services: core-digit-2.9-lts-pgr-02df4964cb-3