collavre_completion_api 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc0d1af87e31a55f8d2cce2c0d6aec2f905168a1eaa8ef6067e503e4542ca6a0
-  data.tar.gz: c2fd5212b7e3aa193f0676ca783192893b483699ff39588038dabdad62a62222
+  metadata.gz: dc50b74db9b7b24ba288392fb8c5a4b269727228829dcf91a0196236f0a5c352
+  data.tar.gz: 5bdad75265afa2f8eae040d22069e8370cb771afd5bc2abccc380a47d2a9def5
 SHA512:
-  metadata.gz: 62ae73bffedce60fa8f0b01e70b2560a17fce22660373c48b5925b8abdfcd500becb26fae7ea4670b920ad761baf34f68e7bf15dc8b4ea916b592c5b6dab1bd0
-  data.tar.gz: 6d8a1ac018385e1a4f92a5fb907b52f62f2c40e7c10291e5bafbe5ce177d018007d556d72f8d755d80a54281281ebceabf84c09796aeefca00abaa353c535f07
+  metadata.gz: 2abccff570987512417cdc2d41f22a7b05177b7bf4bcdb6e44bd47f7b87560d35aa9fe8332ecf7f7abf60d9f3e9f8083605a209394cc915e7362f24188b34605
+  data.tar.gz: 96578d0b13a218be1f72a1086d0e7ecf6fd7ce8a3fb391750b24073602fa29403e251e5c1163d2f084a866404ee8f2dc905fcb908504e43d3c2f005d4657fe86

data/README.md

@@ -32,6 +32,13 @@ Pass optional headers to inject Collavre context into AI prompts:
 - `X-Collavre-Creative: <creative_id>` — Include creative context
 - `X-Collavre-Topic: <topic_id>` — Filter context to specific topic
 
+## Session Tracking
+
+When both `X-Collavre-Creative` and `X-Collavre-Topic` headers are present, the
+completion API forwards an `X-Session-Id` header (`creative_{id}_topic_{id}`) to
+the upstream LLM provider. This allows the gateway to group requests by
+creative/topic pair.
+
 ## Installation
 
 Add to your host app's `Gemfile`:

data/app/controllers/collavre_completion_api/api/v1/base_controller.rb

@@ -17,7 +17,7 @@ module CollavreCompletionApi
             return
           end
 
-          unless authenticate_oauth(token)
+          unless find_user_by_bearer_token(token)
             render json: { error: { message: "Invalid authentication token", type: "invalid_request_error",
                                     code: "invalid_token" } },
                    status: :unauthorized
@@ -25,17 +25,10 @@ module CollavreCompletionApi
           end
         end
 
-        def authenticate_oauth(token)
-          access_token = Doorkeeper::AccessToken.by_token(token)
-          return false unless access_token&.accessible?
-
-          user = Collavre::User.find_by(id: access_token.resource_owner_id)
-          return false unless user
-
-          Collavre::Current.user = user
-          true
-        end
-
+        # Bearer-auth helpers are kept inline here (rather than shared via the
+        # core Collavre::Api::Authenticatable concern) so this engine stays
+        # loadable under USE_COLLAVRE_GEM=true, where core resolves to a
+        # published collavre gem that may predate the concern.
         def extract_bearer_token
           auth_header = request.headers["Authorization"]
           return nil unless auth_header&.start_with?("Bearer ")
@@ -43,6 +36,19 @@ module CollavreCompletionApi
           auth_header.sub("Bearer ", "")
         end
 
+        def find_user_by_bearer_token(token)
+          return nil if token.blank?
+
+          access_token = Doorkeeper::AccessToken.by_token(token)
+          return nil unless access_token&.accessible?
+
+          user = Collavre::User.find_by(id: access_token.resource_owner_id)
+          return nil unless user
+
+          Collavre::Current.user = user
+          user
+        end
+
         def current_user
           Collavre::Current.user
         end

data/app/controllers/collavre_completion_api/api/v1/chat/completions_controller.rb

@@ -37,7 +37,7 @@ module CollavreCompletionApi
               system_prompt: system_prompt,
               llm_api_key: api_key,
               gateway_url: agent.respond_to?(:gateway_url) ? agent.gateway_url : nil,
-              context: { creative: collavre_creative, user: current_user }
+              context: { creative: collavre_creative, user: current_user, topic_id: collavre_topic&.id }
             )
 
             model_name = params[:model] || agent_model_id(agent)
@@ -80,7 +80,7 @@ module CollavreCompletionApi
             end
 
             scope = collavre_creative.comments
-                                     .where(private: false)
+                                     .public_only
                                      .order(created_at: :desc)
             scope = scope.where(topic_id: collavre_topic.id) if collavre_topic
             recent_comments = scope.limit(CREATIVE_CONTEXT_COMMENT_LIMIT)

data/lib/collavre_completion_api/version.rb

@@ -1,3 +1,3 @@
 module CollavreCompletionApi
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_completion_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Collavre