From ae31a2ab3ea06c5f8580862096c0937102748308 Mon Sep 17 00:00:00 2001 From: Olga Stefaniuk Date: Wed, 16 Oct 2024 09:21:41 +0200 Subject: [PATCH 1/3] Resolve conflicts --- content/pages/ai-dev-zone/index.md | 56 ++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/content/pages/ai-dev-zone/index.md b/content/pages/ai-dev-zone/index.md index 6d60a8eab..d1f91c26d 100644 --- a/content/pages/ai-dev-zone/index.md +++ b/content/pages/ai-dev-zone/index.md @@ -58,6 +58,7 @@ view sample code, explore Box AI use cases, and more! href="/reference/resources/ai-response/"> Check the API reference for specification details. +<<<<<<< HEAD Documentation Documentation +======= + AI API + + + Browse the guides to learn how to use Box AI Platform API. + + AI API +>>>>>>> d527af77d (Add video section in the AI Dev zone) Check table list of the supported AI models. +<<<<<<< HEAD Documentation +======= + AI API +>>>>>>> d527af77d (Add video section in the AI Dev zone) @@ -86,13 +100,21 @@ view sample code, explore Box AI use cases, and more! Box for AI Integrations

+<<<<<<< HEAD Use Box for AI Integrations to extend LLM models' existing knowledge bases. +======= + Expand the capabilities of your applications beyond the models’ existing knowledge bases. +>>>>>>> d527af77d (Add video section in the AI Dev zone)

+<<<<<<< HEAD Enable access to Box content within LLM workflows with Box reader suite for LlamaIndex. +======= + Enable access of Box content within LLM workflows with Box reader suite for LlamaIndex. +>>>>>>> d527af77d (Add video section in the AI Dev zone) New @@ -115,6 +137,7 @@ view sample code, explore Box AI use cases, and more!
Videos
+<<<<<<< HEAD Watch the latest Box AI API tutorials and demos. @@ -146,6 +169,39 @@ view sample code, explore Box AI use cases, and more! Learn why Box chose to expose Box AI through our public API. +======= + Watch the latest Box AI Platform API tutorials and demos. + + + + Box AI Platform API - In One Minute + + + + Box AI Platform API - Document Q&A + + + + Box AI Platform API - Text generation + + + + Box AI Platform API Demo - Metadata extraction - Freeform + + + + Box AI Platform API - Metadata extraction - Structured + + + + Box AI Platform API - Preview UI element +>>>>>>> d527af77d (Add video section in the AI Dev zone) From 635c0f87bc3503df032f5f3d9b1fe13fb559f313 Mon Sep 17 00:00:00 2001 From: Olga Stefaniuk Date: Tue, 18 Feb 2025 18:07:31 +0100 Subject: [PATCH 2/3] Fix conflict --- content/pages/ai-dev-zone/index.md | 58 +----------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/content/pages/ai-dev-zone/index.md b/content/pages/ai-dev-zone/index.md index d1f91c26d..cca771602 100644 --- a/content/pages/ai-dev-zone/index.md +++ b/content/pages/ai-dev-zone/index.md @@ -23,7 +23,7 @@ view sample code, explore Box AI use cases, and more!
Try out interactive demos
- Box AI API is available to all Enterprise Plus and Enterprise Advanced customers. Endpoints related to metadata extraction are currently a beta feature offered subject to Box’s Main Beta Agreement, and the available capabilities may change. + Box AI API is available to all Enterprise Plus and Enterprise Advanced customers. @@ -58,7 +58,6 @@ view sample code, explore Box AI use cases, and more! href="/reference/resources/ai-response/"> Check the API reference for specification details. -<<<<<<< HEAD Documentation Documentation -======= - AI API - - - Browse the guides to learn how to use Box AI Platform API. - - AI API ->>>>>>> d527af77d (Add video section in the AI Dev zone) Check table list of the supported AI models. -<<<<<<< HEAD Documentation -======= - AI API ->>>>>>> d527af77d (Add video section in the AI Dev zone) @@ -100,21 +86,13 @@ view sample code, explore Box AI use cases, and more! Box for AI Integrations

-<<<<<<< HEAD Use Box for AI Integrations to extend LLM models' existing knowledge bases. -======= - Expand the capabilities of your applications beyond the models’ existing knowledge bases. ->>>>>>> d527af77d (Add video section in the AI Dev zone)

-<<<<<<< HEAD Enable access to Box content within LLM workflows with Box reader suite for LlamaIndex. -======= - Enable access of Box content within LLM workflows with Box reader suite for LlamaIndex. ->>>>>>> d527af77d (Add video section in the AI Dev zone) New @@ -137,7 +115,6 @@ view sample code, explore Box AI use cases, and more!
Videos
-<<<<<<< HEAD Watch the latest Box AI API tutorials and demos. @@ -169,39 +146,6 @@ view sample code, explore Box AI use cases, and more! Learn why Box chose to expose Box AI through our public API. -======= - Watch the latest Box AI Platform API tutorials and demos. - - - - Box AI Platform API - In One Minute - - - - Box AI Platform API - Document Q&A - - - - Box AI Platform API - Text generation - - - - Box AI Platform API Demo - Metadata extraction - Freeform - - - - Box AI Platform API - Metadata extraction - Structured - - - - Box AI Platform API - Preview UI element ->>>>>>> d527af77d (Add video section in the AI Dev zone) From 2c33a487c9563100be3c41d98a3eba79d0bad15b Mon Sep 17 00:00:00 2001 From: Olga Stefaniuk Date: Tue, 11 Mar 2025 09:15:59 +0100 Subject: [PATCH 3/3] Add Platform intro to SDK pages --- content/guides/tooling/sdks/index.md | 2 ++ content/pages/sdks-and-tools/index.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/content/guides/tooling/sdks/index.md b/content/guides/tooling/sdks/index.md index 22fc13055..13c7a69a2 100644 --- a/content/guides/tooling/sdks/index.md +++ b/content/guides/tooling/sdks/index.md @@ -53,6 +53,8 @@ Here's what you can expect from the new SDKs: - **Embedded Documentation**: All objects and parameters are documented directly in the source code of the SDK so all the necessary information is stored in one place. - **Enhanced Convenience Methods**: The newly introduced convenience methods cover various aspects such as authentication, chunk uploads, exponential back-offs, automatic retries, type checkers which help to ensure that you’re using variables correctly, and much more. +Find the Box Platform SDK in programming language of your choice and get started: + | Platform | Maintained? | API Parity | | ----------------------------------- | ----------- | ---------- | | [Python Gen SDK][pythongensdk] | Yes | Full | diff --git a/content/pages/sdks-and-tools/index.md b/content/pages/sdks-and-tools/index.md index bd4914628..32c40557e 100644 --- a/content/pages/sdks-and-tools/index.md +++ b/content/pages/sdks-and-tools/index.md @@ -58,6 +58,8 @@ Here's what you can expect from the new SDKs: - **Embedded Documentation**: All objects and parameters are documented directly in the source code of the SDK so all the necessary information is stored in one place. - **Enhanced Convenience Methods**: The newly introduced convenience methods cover various aspects such as authentication, chunk uploads, exponential back-offs, automatic retries, type checkers which help to ensure that you’re using variables correctly, and much more. +Find the Box Platform SDK in programming language of your choice and get started: + | Platform | Maintained? | API Parity | | ----------------------------------- | ----------- | ---------- | | [Python Gen SDK][pythongensdk] | Yes | Full |