Skip to content

Commit ae31a2a

Browse files
Resolve conflicts
1 parent d175be0 commit ae31a2a

1 file changed

Lines changed: 56 additions & 0 deletions

File tree

content/pages/ai-dev-zone/index.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,33 @@ view sample code, explore Box AI use cases, and more!
5858
href="/reference/resources/ai-response/">
5959
Check the API reference for specification details.
6060

61+
<<<<<<< HEAD
6162
<strong style="background-color: #e8e8e8">Documentation</strong>
6263
</Tile>
6364
<Tile type="code-new" title="Developer guides"
6465
href="/guides/box-ai/">
6566
Browse the guides to learn how to use Box AI API.
6667

6768
<strong style="background-color: #e8e8e8">Documentation</strong>
69+
=======
70+
<strong style="background-color: #e8e8e8">AI API</strong>
71+
</Tile>
72+
<Tile type="code-new" title="Developer guides"
73+
href="/guides/box-ai/">
74+
Browse the guides to learn how to use Box AI Platform API.
75+
76+
<strong style="background-color: #e8e8e8">AI API</strong>
77+
>>>>>>> d527af77d (Add video section in the AI Dev zone)
6878
</Tile>
6979
<Tile type="code-new" title="Supported AI models"
7080
href="/guides/box-ai/supported-models/">
7181
Check table list of the supported AI models.
7282

83+
<<<<<<< HEAD
7384
<strong style="background-color: #e8e8e8">Documentation</strong>
85+
=======
86+
<strong style="background-color: #e8e8e8">AI API</strong>
87+
>>>>>>> d527af77d (Add video section in the AI Dev zone)
7488
</Tile>
7589
<Tile type="code-new" title="Support"
7690
href="https://community.box.com/">
@@ -86,13 +100,21 @@ view sample code, explore Box AI use cases, and more!
86100
Box for AI Integrations
87101
</Header>
88102
<p style="text-align: left; margin-left: 0;">
103+
<<<<<<< HEAD
89104
Use Box for AI Integrations to extend LLM models' existing knowledge bases.
105+
=======
106+
Expand the capabilities of your applications beyond the models’ existing knowledge bases.
107+
>>>>>>> d527af77d (Add video section in the AI Dev zone)
90108
</p>
91109
92110
<TileGrid rows="4">
93111
<Tile type="box-brown" title="LlamaIndex"
94112
href="https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-box#readme">
113+
<<<<<<< HEAD
95114
Enable access to Box content within LLM workflows with Box reader suite for LlamaIndex.
115+
=======
116+
Enable access of Box content within LLM workflows with Box reader suite for LlamaIndex.
117+
>>>>>>> d527af77d (Add video section in the AI Dev zone)
96118
97119
<strong style="background-color: #e8e8e8">New</strong>
98120
</Tile>
@@ -115,6 +137,7 @@ view sample code, explore Box AI use cases, and more!
115137
<Header centered>
116138
Videos
117139
</Header>
140+
<<<<<<< HEAD
118141
Watch the latest Box AI API tutorials and demos.
119142

120143
<TileGrid rows="3">
@@ -146,6 +169,39 @@ view sample code, explore Box AI use cases, and more!
146169
<Tile image="API-interview" title="Hear from Box CPO Diego Dugatkin"
147170
href="https://www.youtube.com/watch?v=NA4NiqBdSg4&t=2s">
148171
Learn why Box chose to expose Box AI through our public API.
172+
=======
173+
Watch the latest Box AI Platform API tutorials and demos.
174+
175+
<TileGrid rows="3">
176+
<Tile image="AI-API" title="Quick overview"
177+
href="https://www.youtube.com/watch?v=amhOj0YRVRQ&list=PLCSEWOlbcUyI2ta24oRr75_4igvMzKJ9q">
178+
Box AI Platform API - In One Minute
179+
180+
</Tile>
181+
<Tile image="API-q&a" title="Document Q&A"
182+
href="https://www.youtube.com/watch?v=UyKfacz6G9g&list=PLCSEWOlbcUyI2ta24oRr75_4igvMzKJ9q">
183+
Box AI Platform API - Document Q&A
184+
185+
</Tile>
186+
<Tile image="API-text-gen" title="Text generation"
187+
href="https://www.youtube.com/watch?v=xxR8aF4r3g8&list=PLCSEWOlbcUyI2ta24oRr75_4igvMzKJ9q">
188+
Box AI Platform API - Text generation
189+
190+
</Tile>
191+
<Tile image="API-extract" title="Metadata extraction"
192+
href="https://www.youtube.com/watch?v=fijj0CX67c4&list=PLCSEWOlbcUyI2ta24oRr75_4igvMzKJ9q">
193+
Box AI Platform API Demo - Metadata extraction - Freeform
194+
195+
</Tile>
196+
<Tile image="API-extract-structured" title="Metadata structured extraction"
197+
href="https://www.youtube.com/watch?v=dU3oo4sHZt0&list=PLCSEWOlbcUyI2ta24oRr75_4igvMzKJ9q">
198+
Box AI Platform API - Metadata extraction - Structured
199+
200+
</Tile>
201+
<Tile image="AI-BUIE" title="Box AI for Box UI Elements"
202+
href="https://www.youtube.com/watch?v=8DmMgkm-6Tw&list=PLCSEWOlbcUyI2ta24oRr75_4igvMzKJ9q">
203+
Box AI Platform API - Preview UI element
204+
>>>>>>> d527af77d (Add video section in the AI Dev zone)
149205
150206
</Tile>
151207
</TileGrid>

0 commit comments

Comments
 (0)