fix: schemas betwen services

services/llm-client/diplomat/http_client.py

@@ -14,7 +14,6 @@ def complete(rendered_prompt : RenderedPrompt):
             "url": f"data:image/jpeg;base64,{image}"
         }
     } for image in rendered_prompt.images]
-    print(rendered_prompt.prompt)
     completion = client.chat.completions.create(
             model="gpt-4o-mini",
             messages=[
@@ -30,5 +29,6 @@ def complete(rendered_prompt : RenderedPrompt):
                 }
             ],
         )
+    print(completion.choices[0].message.content)
     return completion.choices[0].message.content
 

src/purchase_listinator/modules/shopping/adapters/in/cart.clj

@@ -1,28 +1,26 @@
 (ns purchase-listinator.modules.shopping.adapters.in.cart
   (:require
-    [purchase-listinator.modules.shopping.schemas.models.cart :as models.internal.cart]
     [purchase-listinator.modules.shopping.schemas.models.cart-events :as internal.cart-events]
     [purchase-listinator.modules.shopping.schemas.models.shopping-list :as models.internal.shopping-list]
-    [purchase-listinator.modules.shopping.schemas.wires.in.cart :as wires.in.cart]
     [schema.core :as s]))
 
-(s/defn wire->internal :- models.internal.cart/Cart
-  [wire :- wires.in.cart/Cart]
+(s/defn wire->internal :- [internal.cart-events/CartEvent]
+  [wire :- [internal.cart-events/CartEvent]]
   wire)
 
 (s/defn ^:private item->change-item-event :- internal.cart-events/ChangeItemEvent
-  [{:keys [id quantity quantity-in-cart price ] } :- models.internal.shopping-list/ShoppingItem
-   {:keys [purchase-list-id user-id ] :as  shopping} :- models.internal.shopping-list/ShoppingList
+  [{:keys [id quantity quantity-in-cart price]} :- models.internal.shopping-list/ShoppingItem
+   {:keys [shopping-id user-id] :as shopping-list} :- models.internal.shopping-list/ShoppingList
    now :- s/Num]
-  {:id               id
+  {:event-id         id
    :moment           now
    :event-type       :change-item
    :user-id          user-id
-   :shopping-id      (:id shopping)
+   :shopping-id      shopping-id
    :item-id          id
    :price            price
-   :quantity-changed (- quantity quantity-in-cart)
-   :purchase-list-id purchase-list-id})
+   :quantity-changed (- quantity (or quantity-in-cart 0))
+   :purchase-list-id (:id shopping-list)})
 
 (s/defn items->change-item-event :- [internal.cart-events/ChangeItemEvent]
   [items :- [models.internal.shopping-list/ShoppingItem]

src/purchase_listinator/modules/shopping/diplomat/http/client.clj

@@ -2,6 +2,7 @@
   (:require
     [purchase-listinator.components.http :as components.http]
     [purchase-listinator.modules.shopping.schemas.models.cart :as models.internal.cart]
+    [purchase-listinator.modules.shopping.schemas.models.cart-events :as internal.cart-events]
     [purchase-listinator.modules.shopping.schemas.models.price-suggestion :as models.internal.price-suggestion]
     [purchase-listinator.modules.shopping.schemas.models.shopping-list :as models.internal.shopping-list]
     [purchase-listinator.modules.shopping.schemas.wires.in.llm :as shopping.schemas.wires.in.llm]
@@ -69,18 +70,16 @@
                                      :result-schema wires.in.cart/Cart})
       (adapters.in.cart/wire->internal)))
 
-(s/defn post-cart-events-in-batch :- models.internal.cart/Cart
+(s/defn post-cart-events-in-batch :- [internal.cart-events/CartEvent]
   [shopping :- models.internal.shopping-list/ShoppingList
    items :- [models.internal.shopping-list/ShoppingItem]
    now :- s/Num
    user-id :- s/Uuid
    http :- components.http/IHttp]
-  (-> (components.http/request http {:method        :post
-                                     :url           :shopping-cart/receive-events-in-batch
-                                     :user-id       user-id
-                                     :query-params  (adapters.in.cart/items->change-item-event items shopping now)
-                                     :result-schema wires.in.cart/Cart})
-      (adapters.in.cart/wire->internal)))
+  (components.http/request http {:method  :post
+                                 :url     :shopping-cart/receive-events-in-batch
+                                 :user-id user-id
+                                 :body    (adapters.in.cart/items->change-item-event items shopping now)}))
 
 (s/defn post-interaction :- (s/maybe [s/Uuid])
   [request-id :- s/Uuid

src/purchase_listinator/modules/shopping/flows/shopping.clj

@@ -113,6 +113,6 @@
         item-ids (http.client.shopping/post-interaction request-id shopping image user-id http)
         items-marked-by-ia (logic.shopping/get-items shopping item-ids)
         now (misc.date/numb-now)
-        response (http.client.shopping/post-cart-events-in-batch shopping items-marked-by-ia now user-id http)]
-
-    (clojure.pprint/pprint response)))
+        _response (http.client.shopping/post-cart-events-in-batch shopping items-marked-by-ia now user-id http)
+        final-shopping (cart-module-management list-id user-id shopping-id http)]
+    final-shopping))

src/purchase_listinator/modules/shopping/schemas/wires/in/llm.clj

@@ -2,7 +2,7 @@
   (:require [schema.core :as s]))
 
 (s/defschema InteractionResponse
-  {:request-id s/Uuid
+  {:request-id s/Str
    :response (s/maybe s/Str)
    :status s/Str
    :details s/Str})

src/purchase_listinator/modules/shopping_cart/flows/cart_events_reception.clj

@@ -18,6 +18,6 @@
 
 (s/defn receive-cart-event-in-batch-by-list
   [events :- [internal.cart-events/CartEvent]
-   {:keys [shopping-cart/redis]}]
-  (map #(receive-cart-event-by-list % redis) events)
+   components]
+  (mapv #(receive-cart-event-by-list % components) events)
   events)