dhti-cli 0.8.0 → 1.1.0

package/dist/resources/spa/glycemic.scss

@@ -0,0 +1,44 @@
+.container {
+  padding: 1rem;
+  background-color: var(--ui-01);
+  border: 1px solid var(--ui-03);
+  margin-bottom: 1rem;
+}
+
+.header {
+  margin-bottom: 1rem;
+  h3 {
+    margin: 0;
+  }
+}
+
+.content {
+  display: flex;
+  gap: 2rem;
+  flex-wrap: wrap;
+}
+
+.observations, .aiInsights {
+  flex: 1;
+  min-width: 300px;
+}
+
+.observations ul {
+  list-style: none;
+  padding: 0;
+  li {
+    margin-bottom: 0.5rem;
+    border-bottom: 1px solid var(--ui-03);
+    padding-bottom: 0.25rem;
+  }
+}
+
+.aiContent {
+  background-color: var(--ui-02);
+  padding: 1rem;
+  border-radius: 4px;
+}
+
+.error {
+  color: var(--support-01);
+}

package/dist/resources/spa/hooks/useDhti.ts

@@ -0,0 +1,69 @@
+import {useState} from 'react'
+import axios from 'axios'
+import {CDSHookRequest} from '../models/request'
+import {CDSHookCard} from '../models/card'
+import {useConfig, openmrsFetch, fhirBaseUrl} from '@openmrs/esm-framework'
+
+interface UseDhtiReturn {
+  submitMessage: (newMessage: string, patientId?: string) => Promise<CDSHookCard | null>
+  loading: boolean
+  error: string | null
+}
+
+/**
+ * Custom hook to handle DHTI service submissions
+ * @returns Object with submitMessage function, loading state, and error state
+ */
+export const useDhti = (): UseDhtiReturn => {
+  const [loading, setLoading] = useState<boolean>(false)
+  const [error, setError] = useState<string | null>(null)
+  const config = useConfig()
+
+  const submitMessage = async (newMessage: string, patientId?: string): Promise<CDSHookCard | null> => {
+    setLoading(true)
+    setError(null)
+
+    try {
+      const request = new CDSHookRequest({
+        context: {input: newMessage, patientId: patientId || undefined},
+      })
+
+      // TODO: Investigate why nested input is required
+      const _request = {
+        input: request,
+      }
+
+      const response = await axios.post(
+        config?.dhtiRoute || 'http://localhost:8001/langserve/dhti_elixir_template/cds-services/dhti-service',
+        {
+          input: _request,
+          config: {},
+          kwargs: {},
+        },
+        {
+          headers: {
+            'Access-Control-Allow-Origin': '*',
+          },
+        },
+      )
+
+      // Assuming the response contains a card or cards
+      if (response.data && response.data.cards && response.data.cards.length > 0) {
+        return CDSHookCard.from(response.data.cards[0])
+      } else if (response.data && response.data.summary) {
+        // Handle case where response is directly a card (must have summary property)
+        return CDSHookCard.from(response.data)
+      }
+
+      return null
+    } catch (err: any) {
+      const errorMessage = err.response?.data?.message || err.message || 'Failed to submit message'
+      setError(errorMessage)
+      return null
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  return {submitMessage, loading, error}
+}

package/dist/resources/spa/hooks/usePatient.ts

@@ -0,0 +1,61 @@
+import useSWR from 'swr'
+import {fhirBaseUrl, openmrsFetch} from '@openmrs/esm-framework'
+
+/**
+ * This hook searches for a patient using the provided search term from the
+ * OpenMRS FHIR API. It leverages the useSWR hook from the SWR library
+ * https://swr.vercel.app/docs/data-fetching to fetch data. SWR provides a
+ * number of benefits over the standard React useEffect hook, including:
+ *
+ * - Fast, lightweight and reusable data fetching
+ * - Built-in cache and request deduplication
+ * - Real-time updates
+ * - Simplified error and loading state handling, and more.
+ *
+ *  We recommend using SWR for data fetching in your OpenMRS frontend modules.
+ *
+ * See the docs for the underlying fhir.js Client object: https://github.com/FHIR/fhir.js#api
+ * See the OpenMRS FHIR Module docs: https://wiki.openmrs.org/display/projects/OpenMRS+FHIR+Module
+ * See the OpenMRS REST API docs: https://rest.openmrs.org/#openmrs-rest-api
+ *
+ * @param query A patient name or ID
+ * @returns The first matching patient
+ */
+
+export function usePatient(query: string) {
+  // If query has a number anywhere in it, treat it as an identifier search
+  const isId = /\d/.test(query)
+  let url = null
+  if (query && query.trim()) {
+    if (isId) {
+      url = `${fhirBaseUrl}/Patient?identifier=${encodeURIComponent(query.trim())}&_summary=data`
+    } else {
+      url = `${fhirBaseUrl}/Patient?name=${encodeURIComponent(query.trim())}&_summary=data`
+    }
+  }
+  const {data, error, isLoading} = useSWR<any, Error>(url, openmrsFetch)
+
+  let patient = null
+  // * Use the code below to handle direct ID searches, if needed in future
+  // --- IGNORE ---
+  // if (isId) {
+  //   // FHIR /Patient/{id} returns the patient directly
+  //   if (data && data.resourceType === 'Patient') {
+  //     patient = data;
+  //   }
+  // } else {
+  //   if (data && data.data && Array.isArray(data.data.entry) && data.data.entry.length > 0) {
+  //     patient = data.data.entry[0].resource;
+  //   }
+  // }
+
+  if (data && data.data && Array.isArray(data.data.entry) && data.data.entry.length > 0) {
+    patient = data.data.entry[0].resource
+  }
+
+  return {
+    patient,
+    error: error,
+    isLoading,
+  }
+}

package/dist/resources/spa/index.ts

@@ -0,0 +1,17 @@
+import {getAsyncLifecycle, defineConfigSchema} from '@openmrs/esm-framework'
+import {configSchema} from './config-schema'
+
+const moduleName = '@openmrs/esm-dhti-glycemic'
+
+const options = {
+  featureName: 'dhti-glycemic',
+  moduleName,
+}
+
+export const importTranslation = require.context('../translations', false, /.json$/, 'lazy')
+
+export function startupApp() {
+  defineConfigSchema(moduleName, configSchema)
+}
+
+export const glycemic = getAsyncLifecycle(() => import('./glycemic.component'), options)

package/dist/resources/spa/models/card.ts

@@ -0,0 +1,80 @@
+/**
+ * TypeScript models for CDS Hook Card
+ *
+ * Example:
+ * {
+ *   "summary": "Patient is at high risk for opioid overdose.",
+ *   "detail": "According to CDC guidelines, the patient's opioid dosage should be tapered to less than 50 MME. [Link to CDC Guideline](https://www.cdc.gov/drugoverdose/prescribing/guidelines.html)",
+ *   "indicator": "warning",
+ *   "source": {
+ *     "label": "CDC Opioid Prescribing Guidelines",
+ *     "url": "https://www.cdc.gov/drugoverdose/prescribing/guidelines.html",
+ *     "icon": "https://example.org/img/cdc-icon.png"
+ *   },
+ *   "links": [
+ *     {
+ *       "label": "View MME Conversion Table",
+ *       "url": "https://www.cdc.gov/drugoverdose/prescribing/mme.html"
+ *     }
+ *   ]
+ * }
+ */
+
+/**
+ * The allowed indicators for a CDS Hook Card.
+ * Mirrors: Literal["info", "warning", "hard-stop"]
+ */
+export type CDSHookCardIndicator = 'info' | 'warning' | 'hard-stop'
+
+/**
+ * Source of the CDS Hook Card
+ */
+export class CDSHookCardSource {
+  label!: string
+  url?: string
+  icon?: string
+
+  constructor(init?: Partial<CDSHookCardSource>) {
+    Object.assign(this, init)
+  }
+}
+
+/**
+ * Link associated with the CDS Hook Card
+ */
+export class CDSHookCardLink {
+  label!: string
+  url!: string
+
+  constructor(init?: Partial<CDSHookCardLink>) {
+    Object.assign(this, init)
+  }
+}
+
+/**
+ * CDS Hook Card Model
+ */
+export class CDSHookCard {
+  summary!: string
+  detail?: string
+  indicator?: CDSHookCardIndicator
+  source?: CDSHookCardSource
+  links?: CDSHookCardLink[]
+
+  constructor(init?: Partial<CDSHookCard>) {
+    if (init) {
+      // Shallow assign for primitives; nested objects handled below if present
+      const {source, links, ...rest} = init as CDSHookCard
+      Object.assign(this, rest)
+      if (source) this.source = new CDSHookCardSource(source)
+      if (links) this.links = links.map((l) => new CDSHookCardLink(l))
+    }
+  }
+
+  /**
+   * Factory to build a CDSHookCard from a plain object, ensuring nested types are instantiated.
+   */
+  static from(obj: Partial<CDSHookCard>): CDSHookCard {
+    return new CDSHookCard(obj)
+  }
+}

package/dist/resources/spa/models/request.ts

@@ -0,0 +1,42 @@
+/**
+ * CDS Hook Request Model (TypeScript)
+ *
+ * Example:
+ * {
+ *   "hookInstance": "d1577c69-dfbe-44ad-ba6d-3e05e953b2ea",
+ *   "fhirServer": "https://example.com/fhir",
+ *   "fhirAuthorization": { ... },
+ *   "hook": "patient-view",
+ *   "context": { ... },
+ *   "prefetch": { ... }
+ * }
+ */
+
+export class CDSHookRequest {
+  /** A unique identifier for this hook invocation */
+  hookInstance?: string
+
+  /** Base URL of the FHIR server associated with the hook */
+  fhirServer?: string
+
+  /** Authorization details (opaque to this model) */
+  fhirAuthorization?: Record<string, any> | null
+
+  /** Name of the hook (e.g., "patient-view", "order-select", etc.) */
+  hook?: string
+
+  /** Context object passed by the EHR */
+  context?: Record<string, any> | null
+
+  /** Prefetched FHIR resources keyed by name */
+  prefetch?: Record<string, any> | null
+
+  constructor(init?: Partial<CDSHookRequest>) {
+    Object.assign(this, init)
+  }
+
+  /** Factory to build a CDSHookRequest from a plain object. */
+  static from(obj: Partial<CDSHookRequest>): CDSHookRequest {
+    return new CDSHookRequest(obj)
+  }
+}

package/dist/resources/spa/routes.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://json.openmrs.org/routes.schema.json",
+  "backendDependencies": {
+    "fhir2": ">=2.0.0",
+    "webservices.rest": ">=2.2.0"
+  },
+  "extensions": [
+    {
+      "component": "glycemic",
+      "name": "dhti-glycemic-widget",
+      "slot": "patient-chart-summary-dashboard-slot",
+      "meta": {
+        "columnSpan": 4
+      }
+    }
+  ]
+}

package/oclif.manifest.json

@@ -19,6 +19,14 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "env": {
+          "char": "e",
+          "description": "Environment variable name (e.g. FHIR_BASE_URL)",
+          "name": "env",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "file": {
           "char": "f",
           "description": "Full path to the docker compose file to read from. Creates if it does not exist",
@@ -28,6 +36,12 @@
           "multiple": false,
           "type": "option"
         },
+        "host": {
+          "description": "Use host environment variable pattern (e.g. ${VAR_NAME:-default_value})",
+          "name": "host",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "module": {
           "char": "m",
           "description": "Modules to add from ( langserve, openmrs, ollama, langfuse, cqlFhir, redis, neo4j, mcpFhir, mcpx and docktor)",
@@ -35,6 +49,23 @@
           "hasDynamicHelp": false,
           "multiple": true,
           "type": "option"
+        },
+        "service": {
+          "char": "s",
+          "description": "Service name to update environment variables",
+          "name": "service",
+          "default": "langserve",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "value": {
+          "char": "v",
+          "description": "Environment variable value",
+          "name": "value",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -56,42 +87,27 @@
       "aliases": [],
       "args": {
         "op": {
-          "description": "Operation to perform (install, uninstall or dev)",
+          "description": "Operation to perform (init, install, or start)",
           "name": "op"
         }
       },
-      "description": "Install or uninstall conchs to create a Docker image",
+      "description": "Initialize, install, or start OpenMRS frontend development",
       "examples": [
-        "<%= config.bin %> <%= command.id %>"
+        "<%= config.bin %> <%= command.id %> install -n my-app -w ~/projects",
+        "<%= config.bin %> <%= command.id %> init -n my-app -w ~/projects",
+        "<%= config.bin %> <%= command.id %> start -n my-app -w ~/projects",
+        "<%= config.bin %> <%= command.id %> start -n my-app -w ~/projects -s packages/chatbot -s packages/utils"
       ],
       "flags": {
         "branch": {
           "char": "b",
-          "description": "Branch to install from",
+          "description": "Branch to install from (for install operation)",
           "name": "branch",
           "default": "develop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "container": {
-          "char": "c",
-          "description": "Name of the container to copy the conch to while in dev mode",
-          "name": "container",
-          "default": "dhti-frontend-1",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "dev": {
-          "char": "d",
-          "description": "Dev folder to install",
-          "name": "dev",
-          "default": "none",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "dry-run": {
           "description": "Show what changes would be made without actually making them",
           "name": "dry-run",
@@ -100,60 +116,40 @@
         },
         "git": {
           "char": "g",
-          "description": "Github repository to install",
+          "description": "GitHub repository to install (for install operation)",
           "name": "git",
-          "default": "none",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "image": {
-          "char": "i",
-          "description": "Base image to use for the conch",
-          "name": "image",
-          "default": "openmrs/openmrs-reference-application-3-frontend:3.0.0-beta.17",
+          "default": "dermatologist/openmrs-esm-dhti-template",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "local": {
           "char": "l",
-          "description": "Local directory to install from",
+          "description": "Local path to use instead of calculated workdir/name path (for start operation)",
           "name": "local",
-          "default": "none",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "name": {
           "char": "n",
-          "description": "Name of the elixir",
+          "description": "Name of the conch",
           "name": "name",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "repoVersion": {
-          "char": "v",
-          "description": "Version of the conch",
-          "name": "repoVersion",
-          "default": "1.0.0",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "subdirectory": {
+        "sources": {
           "char": "s",
-          "description": "Subdirectory in the repository to install from (for monorepos)",
-          "name": "subdirectory",
-          "default": "none",
+          "description": "Additional sources to include when starting (e.g., packages/esm-chatbot-agent, packages/esm-another-app)",
+          "name": "sources",
           "hasDynamicHelp": false,
-          "multiple": false,
+          "multiple": true,
           "type": "option"
         },
         "workdir": {
           "char": "w",
-          "description": "Working directory to install the conch",
+          "description": "Working directory for the conch",
           "name": "workdir",
           "default": "/home/runner/dhti",
           "hasDynamicHelp": false,
@@ -360,7 +356,7 @@
       "aliases": [],
       "args": {
         "op": {
-          "description": "Operation to perform (install, uninstall or dev)",
+          "description": "Operation to perform (init, install, uninstall, dev or start)",
           "name": "op"
         }
       },
@@ -402,6 +398,23 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "elixir": {
+          "char": "e",
+          "description": "Elixir endpoint URL",
+          "name": "elixir",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "fhir": {
+          "char": "f",
+          "description": "FHIR endpoint URL",
+          "name": "fhir",
+          "default": "http://hapi.fhir.org/baseR4",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "git": {
           "char": "g",
           "description": "Github repository to install",
@@ -792,5 +805,5 @@
       ]
     }
   },
-  "version": "0.8.0"
+  "version": "1.1.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dhti-cli",
   "description": "DHTI CLI",
-  "version": "0.8.0",
+  "version": "1.1.0",
   "author": "Bell Eapen",
   "bin": {
     "dhti-cli": "bin/run.js"
@@ -29,6 +29,8 @@
     "@types/node": "^24",
     "@types/request": "^2.48.12",
     "@types/sinon": "^17.0.4",
+    "@typescript-eslint/eslint-plugin": "^8.53.0",
+    "@typescript-eslint/parser": "^8.53.0",
     "chai": "^4",
     "eslint": "^8",
     "eslint-config-oclif": "^5",

package/dist/resources/spa/Dockerfile

@@ -1,16 +0,0 @@
-FROM node:20 as build
-
-ARG REACT_APP_SERVICES_HOST=/services/m
-
-WORKDIR /app
-
-COPY ./conch .
-
-RUN corepack enable
-RUN yarn install
-RUN yarn build
-
-FROM server-image as server
-COPY ./def /usr/share/nginx/html
-RUN mkdir /usr/share/nginx/html/conch-version
-COPY --from=build /app/dist /usr/share/nginx/html/conch-version

package/dist/resources/spa/def/importmap.json

@@ -1,39 +0,0 @@
-{
-    "imports": {
-        "@openmrs/esm-home-app": "./openmrs-esm-home-app-5.2.2/openmrs-esm-home-app.js",
-        "@openmrs/esm-patient-attachments-app": "./openmrs-esm-patient-attachments-app-7.0.1/openmrs-esm-patient-attachments-app.js",
-        "@openmrs/esm-patient-flags-app": "./openmrs-esm-patient-flags-app-7.0.1/openmrs-esm-patient-flags-app.js",
-        "@openmrs/esm-patient-appointments-app": "./openmrs-esm-patient-appointments-app-7.0.1/openmrs-esm-patient-appointments-app.js",
-        "@openmrs/esm-patient-banner-app": "./openmrs-esm-patient-banner-app-7.0.1/openmrs-esm-patient-banner-app.js",
-        "@openmrs/esm-patient-conditions-app": "./openmrs-esm-patient-conditions-app-7.0.1/openmrs-esm-patient-conditions-app.js",
-        "@openmrs/esm-patient-immunizations-app": "./openmrs-esm-patient-immunizations-app-7.0.1/openmrs-esm-patient-immunizations-app.js",
-        "@openmrs/esm-generic-patient-widgets-app": "./openmrs-esm-generic-patient-widgets-app-7.0.1/openmrs-esm-generic-patient-widgets-app.js",
-        "@openmrs/esm-patient-chart-app": "./openmrs-esm-patient-chart-app-7.0.1/openmrs-esm-patient-chart-app.js",
-        "@openmrs/esm-patient-forms-app": "./openmrs-esm-patient-forms-app-7.0.1/openmrs-esm-patient-forms-app.js",
-        "@openmrs/esm-patient-labs-app": "./openmrs-esm-patient-labs-app-7.0.1/openmrs-esm-patient-labs-app.js",
-        "@openmrs/esm-patient-programs-app": "./openmrs-esm-patient-programs-app-7.0.1/openmrs-esm-patient-programs-app.js",
-        "@openmrs/esm-patient-orders-app": "./openmrs-esm-patient-orders-app-7.0.1/openmrs-esm-patient-orders-app.js",
-        "@openmrs/esm-patient-list-management-app": "./openmrs-esm-patient-list-management-app-6.0.0/openmrs-esm-patient-list-management-app.js",
-        "@openmrs/esm-patient-allergies-app": "./openmrs-esm-patient-allergies-app-7.0.1/openmrs-esm-patient-allergies-app.js",
-        "@openmrs/esm-patient-lists-app": "./openmrs-esm-patient-lists-app-7.0.1/openmrs-esm-patient-lists-app.js",
-        "@openmrs/esm-system-admin-app": "./openmrs-esm-system-admin-app-4.0.1/openmrs-esm-system-admin-app.js",
-        "@openmrs/esm-form-entry-app": "./openmrs-esm-form-entry-app-7.0.1/openmrs-esm-form-entry-app.js",
-        "@openmrs/esm-service-queues-app": "./openmrs-esm-service-queues-app-6.0.0/openmrs-esm-service-queues-app.js",
-        "@openmrs/esm-patient-medications-app": "./openmrs-esm-patient-medications-app-7.0.1/openmrs-esm-patient-medications-app.js",
-        "@openmrs/esm-patient-notes-app": "./openmrs-esm-patient-notes-app-7.0.1/openmrs-esm-patient-notes-app.js",
-        "@openmrs/esm-patient-search-app": "./openmrs-esm-patient-search-app-6.0.0/openmrs-esm-patient-search-app.js",
-        "@openmrs/esm-openconceptlab-app": "./openmrs-esm-openconceptlab-app-4.0.1/openmrs-esm-openconceptlab-app.js",
-        "@openmrs/esm-login-app": "./openmrs-esm-login-app-5.4.0/openmrs-esm-login-app.js",
-        "@openmrs/esm-active-visits-app": "./openmrs-esm-active-visits-app-6.0.0/openmrs-esm-active-visits-app.js",
-        "@openmrs/esm-devtools-app": "./openmrs-esm-devtools-app-5.4.0/openmrs-esm-devtools-app.js",
-        "@openmrs/esm-cohort-builder-app": "./openmrs-esm-cohort-builder-app-3.0.1-pre.183/openmrs-esm-cohort-builder-app.js",
-        "@openmrs/esm-primary-navigation-app": "./openmrs-esm-primary-navigation-app-5.4.0/openmrs-esm-primary-navigation-app.js",
-        "@openmrs/esm-patient-registration-app": "./openmrs-esm-patient-registration-app-6.0.0/openmrs-esm-patient-registration-app.js",
-        "@openmrs/esm-implementer-tools-app": "./openmrs-esm-implementer-tools-app-5.4.0/openmrs-esm-implementer-tools-app.js",
-        "@openmrs/esm-patient-vitals-app": "./openmrs-esm-patient-vitals-app-7.0.1/openmrs-esm-patient-vitals-app.js",
-        "@openmrs/esm-appointments-app": "./openmrs-esm-appointments-app-6.0.0/openmrs-esm-appointments-app.js",
-        "@openmrs/esm-dispensing-app": "./openmrs-esm-dispensing-app-1.3.0/openmrs-esm-dispensing-app.js",
-        "@openmrs/esm-fast-data-entry-app": "./openmrs-esm-fast-data-entry-app-1.0.1-pre.128/openmrs-esm-fast-data-entry-app.js",
-        "@openmrs/esm-form-builder-app": "./openmrs-esm-form-builder-app-2.3.1-pre.677/openmrs-esm-form-builder-app.js"
-    }
-}