From a2247ad3fbfbd72bbc350824d023a850aa2c78c6 Mon Sep 17 00:00:00 2001
From: afthab vp <afthab@multiwoven.com>
Date: Tue, 12 Nov 2024 14:23:07 +0530
Subject: [PATCH 1/2] Resolve conflict in cherry-pick of
 ecc469a62940193e843702894f06fdd44fc8e4fa and change the commit message

---
 integrations/Gemfile.lock                     |  5 ++
 .../lib/multiwoven/integrations/rollout.rb    |  4 ++
 .../source/http_model/config/spec.json        | 53 +++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 integrations/lib/multiwoven/integrations/source/http_model/config/spec.json

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index 5794a858..95899ac3 100644
--- a/integrations/Gemfile.lock
+++ b/integrations/Gemfile.lock
@@ -7,7 +7,12 @@ GIT
 PATH
   remote: .
   specs:
+<<<<<<< HEAD
     multiwoven-integrations (0.13.1)
+=======
+    multiwoven-integrations (0.14.2)
+      MailchimpMarketing
+>>>>>>> ecc469a6 (fix(CE): http model config (#571))
       activesupport
       async-websocket
       aws-sdk-athena
diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
index 667eb292..838ef07e 100644
--- a/integrations/lib/multiwoven/integrations/rollout.rb
+++ b/integrations/lib/multiwoven/integrations/rollout.rb
@@ -2,7 +2,11 @@
 
 module Multiwoven
   module Integrations
+<<<<<<< HEAD
     VERSION = "0.13.1"
+=======
+    VERSION = "0.14.2"
+>>>>>>> ecc469a6 (fix(CE): http model config (#571))
 
     ENABLED_SOURCES = %w[
       Snowflake
diff --git a/integrations/lib/multiwoven/integrations/source/http_model/config/spec.json b/integrations/lib/multiwoven/integrations/source/http_model/config/spec.json
new file mode 100644
index 00000000..4d393ec9
--- /dev/null
+++ b/integrations/lib/multiwoven/integrations/source/http_model/config/spec.json
@@ -0,0 +1,53 @@
+{
+  "documentation_url": "https://docs.multiwoven.com/integrations/source/http-model",
+  "stream_type": "user_defined",
+  "connector_query_type": "ai_ml",
+  "connection_specification": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "Http Model",
+    "type": "object",
+    "required": ["url_host"],
+    "properties": {
+      "url_host": {
+        "type": "string",
+        "title": "URL",
+        "order": 0
+      },
+      "headers": {
+        "title": "Http Headers",
+        "order": 1,
+        "additionalProperties": {
+          "type": "string"
+        }
+      },
+      "config": {
+        "title": "",
+        "type": "object",
+        "properties": {
+          "timeout": {
+            "type": "integer",
+            "minimum": 0,
+            "default": 30,
+            "title": "Http Timeout",
+            "order": 0
+          }
+        },
+        "order": 2
+      },
+      "request_format": {
+        "title": "Request Format",
+        "description": "Sample Request Format",
+        "type": "string",
+        "x-request-format": true,
+        "order": 3
+      },
+      "response_format": {
+        "title": "Response Format",
+        "description": "Sample Response Format",
+        "type": "string",
+        "x-response-format": true,
+        "order": 4
+      }
+    }
+  }
+}

From 5ebbe7c5d5895046a333841bd31b6e9bf0a91317 Mon Sep 17 00:00:00 2001
From: afthab vp <afthab01@gmail.com>
Date: Wed, 13 Nov 2024 14:39:07 +0530
Subject: [PATCH 2/2] chore(CE): resolve conflicts

---
 integrations/Gemfile.lock                           | 2 +-
 integrations/lib/multiwoven/integrations/rollout.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index 57f8f681..b268e97f 100644
--- a/integrations/Gemfile.lock
+++ b/integrations/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    multiwoven-integrations (0.14.0)
+    multiwoven-integrations (0.14.2)
       MailchimpMarketing
       activesupport
       async-websocket
diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
index 2cb81bb7..4abff0f7 100644
--- a/integrations/lib/multiwoven/integrations/rollout.rb
+++ b/integrations/lib/multiwoven/integrations/rollout.rb
@@ -2,7 +2,7 @@
 
 module Multiwoven
   module Integrations
-    VERSION = "0.14.1"
+    VERSION = "0.14.2"
 
     ENABLED_SOURCES = %w[
       Snowflake