Merge branch 'dev' into figure-out-docs

autogpt_platform/backend/backend/blocks/test/test_blocks_dos_vulnerability.py

@@ -196,6 +196,15 @@ class TestXMLParserBlockSecurity:
             async for _ in block.run(XMLParserBlock.Input(input_xml=large_xml)):
                 pass
 
+    async def test_rejects_text_outside_root(self):
+        """Ensure parser surfaces readable errors for invalid root text."""
+        block = XMLParserBlock()
+        invalid_xml = "<root><child>value</child></root> trailing"
+
+        with pytest.raises(ValueError, match="text outside the root element"):
+            async for _ in block.run(XMLParserBlock.Input(input_xml=invalid_xml)):
+                pass
+
 
 class TestStoreMediaFileSecurity:
     """Test file storage security limits."""

autogpt_platform/backend/backend/blocks/xml_parser.py

@@ -1,5 +1,5 @@
 from gravitasml.parser import Parser
-from gravitasml.token import tokenize
+from gravitasml.token import Token, tokenize
 
 from backend.data.block import Block, BlockOutput, BlockSchemaInput, BlockSchemaOutput
 from backend.data.model import SchemaField
@@ -25,6 +25,38 @@ class XMLParserBlock(Block):
             ],
         )
 
+    @staticmethod
+    def _validate_tokens(tokens: list[Token]) -> None:
+        """Ensure the XML has a single root element and no stray text."""
+        if not tokens:
+            raise ValueError("XML input is empty.")
+
+        depth = 0
+        root_seen = False
+
+        for token in tokens:
+            if token.type == "TAG_OPEN":
+                if depth == 0 and root_seen:
+                    raise ValueError("XML must have a single root element.")
+                depth += 1
+                if depth == 1:
+                    root_seen = True
+            elif token.type == "TAG_CLOSE":
+                depth -= 1
+                if depth < 0:
+                    raise SyntaxError("Unexpected closing tag in XML input.")
+            elif token.type in {"TEXT", "ESCAPE"}:
+                if depth == 0 and token.value:
+                    raise ValueError(
+                        "XML contains text outside the root element; "
+                        "wrap content in a single root tag."
+                    )
+
+        if depth != 0:
+            raise SyntaxError("Unclosed tag detected in XML input.")
+        if not root_seen:
+            raise ValueError("XML must include a root element.")
+
     async def run(self, input_data: Input, **kwargs) -> BlockOutput:
         # Security fix: Add size limits to prevent XML bomb attacks
         MAX_XML_SIZE = 10 * 1024 * 1024  # 10MB limit for XML input
@@ -35,7 +67,9 @@ class XMLParserBlock(Block):
             )
 
         try:
-            tokens = tokenize(input_data.input_xml)
+            tokens = list(tokenize(input_data.input_xml))
+            self._validate_tokens(tokens)
+
             parser = Parser(tokens)
             parsed_result = parser.parse()
             yield "parsed_xml", parsed_result

autogpt_platform/backend/poetry.lock

@@ -1924,14 +1924,14 @@ google = ["google-api-python-client (>=2.0.0)", "google-auth (>=2.0.0)"]
 
 [[package]]
 name = "gravitasml"
-version = "0.1.3"
+version = "0.1.4"
 description = ""
 optional = false
 python-versions = "<4.0,>=3.10"
 groups = ["main"]
 files = [
-    {file = "gravitasml-0.1.3-py3-none-any.whl", hash = "sha256:51ff98b4564b7a61f7796f18d5f2558b919d30b3722579296089645b7bc18b85"},
-    {file = "gravitasml-0.1.3.tar.gz", hash = "sha256:04d240b9fa35878252d57a36032130b6516487468847fcdced1022c032a20f57"},
+    {file = "gravitasml-0.1.4-py3-none-any.whl", hash = "sha256:671a18b11d3d8a0e270c6a80c72cd058458b18d5ef7560d00010e962ab1bca74"},
+    {file = "gravitasml-0.1.4.tar.gz", hash = "sha256:35d0d9fec7431817482d53d9c976e375557c3e041d1eb6928e809324a8c866e3"},
 ]
 
 [package.dependencies]
@@ -7295,4 +7295,4 @@ cffi = ["cffi (>=1.11)"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10,<3.14"
-content-hash = "b762806d5d58fcf811220890c4705a16dc62b33387af43e3a29399c62a641098"
+content-hash = "a93ba0cea3b465cb6ec3e3f258b383b09f84ea352ccfdbfa112902cde5653fc6"

autogpt_platform/backend/pyproject.toml

@@ -27,7 +27,7 @@ google-api-python-client = "^2.177.0"
 google-auth-oauthlib = "^1.2.2"
 google-cloud-storage = "^3.2.0"
 googlemaps = "^4.10.0"
-gravitasml = "^0.1.3"
+gravitasml = "^0.1.4"
 groq = "^0.30.0"
 html2text = "^2024.2.26"
 jinja2 = "^3.1.6"

autogpt_platform/cloudflare_worker.js

@@ -0,0 +1,146 @@
+/**
+ * Cloudflare Workers Script for docs.agpt.co → agpt.co/docs migration
+ * 
+ * Deploy this script to handle all redirects with a single JavaScript file.
+ * No rule limits, easy to maintain, handles all edge cases.
+ */
+
+// URL mapping for special cases that don't follow patterns
+const SPECIAL_MAPPINGS = {
+  // Root page
+  '/': '/docs/platform',
+  
+  // Special cases that don't follow standard patterns
+  '/platform/d_id/': '/docs/integrations/block-integrations/d-id',
+  '/platform/blocks/blocks/': '/docs/integrations',
+  '/platform/blocks/decoder_block/': '/docs/integrations/block-integrations/text-decoder',
+  '/platform/blocks/http': '/docs/integrations/block-integrations/send-web-request',
+  '/platform/blocks/llm/': '/docs/integrations/block-integrations/ai-and-llm',
+  '/platform/blocks/time_blocks': '/docs/integrations/block-integrations/time-and-date',
+  '/platform/blocks/text_to_speech_block': '/docs/integrations/block-integrations/text-to-speech',
+  '/platform/blocks/ai_shortform_video_block': '/docs/integrations/block-integrations/ai-shortform-video',
+  '/platform/blocks/replicate_flux_advanced': '/docs/integrations/block-integrations/replicate-flux-advanced',
+  '/platform/blocks/flux_kontext': '/docs/integrations/block-integrations/flux-kontext',
+  '/platform/blocks/ai_condition/': '/docs/integrations/block-integrations/ai-condition',
+  '/platform/blocks/email_block': '/docs/integrations/block-integrations/email',
+  '/platform/blocks/google_maps': '/docs/integrations/block-integrations/google-maps',
+  '/platform/blocks/google/gmail': '/docs/integrations/block-integrations/gmail',
+  '/platform/blocks/github/issues/': '/docs/integrations/block-integrations/github-issues',
+  '/platform/blocks/github/repo/': '/docs/integrations/block-integrations/github-repo',
+  '/platform/blocks/github/pull_requests': '/docs/integrations/block-integrations/github-pull-requests',
+  '/platform/blocks/twitter/twitter': '/docs/integrations/block-integrations/twitter',
+  '/classic/setup/': '/docs/classic/setup/setting-up-autogpt-classic',
+  '/code-of-conduct/': '/docs/classic/help-us-improve-autogpt/code-of-conduct',
+  '/contributing/': '/docs/classic/contributing',
+  '/contribute/': '/docs/contribute',
+  '/forge/components/introduction/': '/docs/classic/forge/introduction'
+};
+
+/**
+ * Transform path by replacing underscores with hyphens and removing trailing slashes
+ */
+function transformPath(path) {
+  return path.replace(/_/g, '-').replace(/\/$/, '');
+}
+
+/**
+ * Handle docs.agpt.co redirects
+ */
+function handleDocsRedirect(url) {
+  const pathname = url.pathname;
+  
+  // Check special mappings first
+  if (SPECIAL_MAPPINGS[pathname]) {
+    return `https://agpt.co${SPECIAL_MAPPINGS[pathname]}`;
+  }
+  
+  // Pattern-based redirects
+  
+  // Platform blocks: /platform/blocks/* → /docs/integrations/block-integrations/*
+  if (pathname.startsWith('/platform/blocks/')) {
+    const blockName = pathname.substring('/platform/blocks/'.length);
+    const transformedName = transformPath(blockName);
+    return `https://agpt.co/docs/integrations/block-integrations/${transformedName}`;
+  }
+  
+  // Platform contributing: /platform/contributing/* → /docs/platform/contributing/*
+  if (pathname.startsWith('/platform/contributing/')) {
+    const subPath = pathname.substring('/platform/contributing/'.length);
+    return `https://agpt.co/docs/platform/contributing/${subPath}`;
+  }
+  
+  // Platform general: /platform/* → /docs/platform/* (with underscore→hyphen)
+  if (pathname.startsWith('/platform/')) {
+    const subPath = pathname.substring('/platform/'.length);
+    const transformedPath = transformPath(subPath);
+    return `https://agpt.co/docs/platform/${transformedPath}`;
+  }
+  
+  // Forge components: /forge/components/* → /docs/classic/forge/introduction/*
+  if (pathname.startsWith('/forge/components/')) {
+    const subPath = pathname.substring('/forge/components/'.length);
+    return `https://agpt.co/docs/classic/forge/introduction/${subPath}`;
+  }
+  
+  // Forge general: /forge/* → /docs/classic/forge/*
+  if (pathname.startsWith('/forge/')) {
+    const subPath = pathname.substring('/forge/'.length);
+    return `https://agpt.co/docs/classic/forge/${subPath}`;
+  }
+  
+  // Classic: /classic/* → /docs/classic/*
+  if (pathname.startsWith('/classic/')) {
+    const subPath = pathname.substring('/classic/'.length);
+    return `https://agpt.co/docs/classic/${subPath}`;
+  }
+  
+  // Default fallback
+  return 'https://agpt.co/docs/';
+}
+
+/**
+ * Main Worker function
+ */
+export default {
+  async fetch(request, env, ctx) {
+    const url = new URL(request.url);
+    
+    // Only handle docs.agpt.co requests
+    if (url.hostname === 'docs.agpt.co') {
+      const redirectUrl = handleDocsRedirect(url);
+      
+      return new Response(null, {
+        status: 301,
+        headers: {
+          'Location': redirectUrl,
+          'Cache-Control': 'max-age=300' // Cache redirects for 5 minutes
+        }
+      });
+    }
+    
+    // For non-docs requests, pass through or return 404
+    return new Response('Not Found', { status: 404 });
+  }
+};
+
+// Test function for local development
+export function testRedirects() {
+  const testCases = [
+    'https://docs.agpt.co/',
+    'https://docs.agpt.co/platform/getting-started/',
+    'https://docs.agpt.co/platform/advanced_setup/',
+    'https://docs.agpt.co/platform/blocks/basic/',
+    'https://docs.agpt.co/platform/blocks/ai_condition/',
+    'https://docs.agpt.co/classic/setup/',
+    'https://docs.agpt.co/forge/components/agents/',
+    'https://docs.agpt.co/contributing/',
+    'https://docs.agpt.co/unknown-page'
+  ];
+  
+  console.log('Testing redirects:');
+  testCases.forEach(testUrl => {
+    const url = new URL(testUrl);
+    const result = handleDocsRedirect(url);
+    console.log(`${testUrl} → ${result}`);
+  });
+}

docs/README.md

@@ -0,0 +1,52 @@
+---
+description: Welcome to your team’s developer platform
+cover: .gitbook/assets/Banner_image.png
+coverY: 56.53835084561286
+layout:
+  width: wide
+  cover:
+    visible: true
+    size: full
+  title:
+    visible: false
+  description:
+    visible: false
+  tableOfContents:
+    visible: false
+  outline:
+    visible: false
+  pagination:
+    visible: false
+  metadata:
+    visible: true
+---
+
+# Developer Platform
+
+<h2 align="center">AutoGPT Documentation</h2>
+
+<p align="center">Create innovative agents that amplify human potential</p>
+
+
+
+<table data-view="cards"><thead><tr><th></th><th></th><th></th><th data-hidden data-card-target data-type="content-ref"></th><th data-hidden data-card-cover data-type="image">Cover image</th></tr></thead><tbody><tr><td><h4><i class="fa-leaf">:leaf:</i></h4></td><td><strong>AutoGPT Platform</strong></td><td>Get started with the developer platform in 5 minutes.</td><td><a href="https://app.gitbook.com/o/ouZP6hgdu8LtbWil2Hvb/s/iMDOYkb9SC1mijdHzvKF/">AutoGPT Platform</a></td><td><a href=".gitbook/assets/AGPT_Platform.png">AGPT_Platform.png</a></td></tr><tr><td><h4><i class="fa-server">:server:</i></h4></td><td><strong>Integrations</strong></td><td>Learn more about hosting the developer platform.</td><td><a href="https://app.gitbook.com/o/ouZP6hgdu8LtbWil2Hvb/s/InwWrtMw9tc0NCzvPVK4/">Integrations</a></td><td><a href=".gitbook/assets/Integrations.png">Integrations.png</a></td></tr><tr><td><h4><i class="fa-terminal">:terminal:</i></h4></td><td><strong>Contribute</strong></td><td>Browse, test, and implement APIs.</td><td><a href="https://app.gitbook.com/s/x9A8W5T9IXYWENaFbHqO/">Contributing to the Docs</a></td><td><a href=".gitbook/assets/Contribute.png">Contribute.png</a></td></tr></tbody></table>
+
+{% columns %}
+{% column valign="middle" %}
+<p align="center"><a href="https://github.com/Significant-Gravitas/AutoGPT/blob/master/LICENSE">AutoGPT License on GitHub</a></p>
+{% endcolumn %}
+
+{% column %}
+<p align="center"><a href="https://app.gitbook.com/s/dDGesk9atyMLUMMo4QuI/autogpt-classic/introduction">AutoGPT Classic (Local Installation)</a></p>
+{% endcolumn %}
+{% endcolumns %}
+
+***
+
+
+
+<h2 align="center">Join a community of 65,000+ developers</h2>
+
+<p align="center">Join our Discord community or create your first PR in just a few steps.</p>
+
+<table data-card-size="large" data-view="cards"><thead><tr><th></th><th></th><th></th><th></th><th data-hidden data-card-cover data-type="files"></th><th data-hidden data-card-target data-type="content-ref"></th></tr></thead><tbody><tr><td><h4><i class="fa-discord">:discord:</i></h4></td><td><strong>Discord community</strong></td><td>Join our Discord community to post questions, get help, and share resources with our growing community of over 55,000 members.</td><td><a href="https://www.gitbook.com/" class="button secondary">Join Discord</a></td><td></td><td><a href="https://discord.com/invite/autogpt">https://discord.com/invite/autogpt</a></td></tr><tr><td><h4><i class="fa-github">:github:</i></h4></td><td><strong>GitHub</strong></td><td>Our product is 100% open source and built by developers just like you. Head to our GitHub repository to learn how to submit your first PR.</td><td><a href="https://www.gitbook.com/" class="button secondary">Submit a PR</a></td><td></td><td><a href="https://github.com/Significant-Gravitas/AutoGPT">https://github.com/Significant-Gravitas/AutoGPT</a></td></tr></tbody></table>

docs/SUMMARY.md

@@ -0,0 +1,3 @@
+# Table of contents
+
+* [Developer Platform](README.md)