mirror of
https://git.mirrors.martin98.com/https://github.com/mendableai/firecrawl
synced 2025-08-12 22:38:58 +08:00
Merge branch 'main' into feat/sdk-without-ws
This commit is contained in:
commit
199bd2d1f4
@ -1,6 +1,7 @@
|
||||
import request from "supertest";
|
||||
import dotenv from "dotenv";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../../lib/strings";
|
||||
|
||||
dotenv.config();
|
||||
|
||||
@ -58,9 +59,7 @@ describe("E2E Tests for API Routes", () => {
|
||||
.set("Content-Type", "application/json")
|
||||
.send({ url: blocklistedUrl });
|
||||
expect(response.statusCode).toBe(403);
|
||||
expect(response.body.error).toContain(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
);
|
||||
expect(response.body.error).toContain(BLOCKLISTED_URL_MESSAGE);
|
||||
});
|
||||
|
||||
// tested on rate limit test
|
||||
@ -480,9 +479,7 @@ describe("E2E Tests for API Routes", () => {
|
||||
.set("Content-Type", "application/json")
|
||||
.send({ url: blocklistedUrl });
|
||||
expect(response.statusCode).toBe(403);
|
||||
expect(response.body.error).toContain(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
);
|
||||
expect(response.body.error).toContain(BLOCKLISTED_URL_MESSAGE);
|
||||
});
|
||||
|
||||
it.concurrent(
|
||||
|
@ -1,5 +1,6 @@
|
||||
import request from "supertest";
|
||||
import dotenv from "dotenv";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../../lib/strings";
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
|
||||
@ -61,9 +62,7 @@ describe("E2E Tests for API Routes with No Authentication", () => {
|
||||
.set("Content-Type", "application/json")
|
||||
.send({ url: blocklistedUrl });
|
||||
expect(response.statusCode).toBe(403);
|
||||
expect(response.body.error).toContain(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
);
|
||||
expect(response.body.error).toContain(BLOCKLISTED_URL_MESSAGE);
|
||||
});
|
||||
|
||||
it("should return a successful response", async () => {
|
||||
@ -88,9 +87,7 @@ describe("E2E Tests for API Routes with No Authentication", () => {
|
||||
.set("Content-Type", "application/json")
|
||||
.send({ url: blocklistedUrl });
|
||||
expect(response.statusCode).toBe(403);
|
||||
expect(response.body.error).toContain(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
);
|
||||
expect(response.body.error).toContain(BLOCKLISTED_URL_MESSAGE);
|
||||
});
|
||||
|
||||
it("should return a successful response", async () => {
|
||||
@ -119,9 +116,7 @@ describe("E2E Tests for API Routes with No Authentication", () => {
|
||||
.set("Content-Type", "application/json")
|
||||
.send({ url: blocklistedUrl });
|
||||
expect(response.statusCode).toBe(403);
|
||||
expect(response.body.error).toContain(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
);
|
||||
expect(response.body.error).toContain(BLOCKLISTED_URL_MESSAGE);
|
||||
});
|
||||
|
||||
it("should return a successful response", async () => {
|
||||
|
@ -4,6 +4,7 @@ import {
|
||||
ScrapeRequestInput,
|
||||
ScrapeResponseRequestTest,
|
||||
} from "../../controllers/v1/types";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../../lib/strings";
|
||||
|
||||
configDotenv();
|
||||
const TEST_URL = "http://127.0.0.1:3002";
|
||||
@ -57,9 +58,7 @@ describe("E2E Tests for v1 API Routes", () => {
|
||||
.send(scrapeRequest);
|
||||
|
||||
expect(response.statusCode).toBe(403);
|
||||
expect(response.body.error).toBe(
|
||||
"Request failed with status code 403. Error: URL is blocked intentionally. Firecrawl currently does not support scraping this site due to policy restrictions. ",
|
||||
);
|
||||
expect(response.body.error).toBe(BLOCKLISTED_URL_MESSAGE);
|
||||
});
|
||||
|
||||
it.concurrent(
|
||||
@ -756,9 +755,7 @@ describe("E2E Tests for v1 API Routes", () => {
|
||||
.send(scrapeRequest);
|
||||
|
||||
expect(response.statusCode).toBe(403);
|
||||
expect(response.body.error).toBe(
|
||||
"Request failed with status code 403. Error: URL is blocked intentionally. Firecrawl currently does not support scraping this site due to policy restrictions. ",
|
||||
);
|
||||
expect(response.body.error).toBe(BLOCKLISTED_URL_MESSAGE);
|
||||
});
|
||||
|
||||
it.concurrent(
|
||||
|
@ -29,6 +29,7 @@ import * as Sentry from "@sentry/node";
|
||||
import { getJobPriority } from "../../lib/job-priority";
|
||||
import { fromLegacyScrapeOptions, url as urlSchema } from "../v1/types";
|
||||
import { ZodError } from "zod";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../../lib/strings";
|
||||
|
||||
export async function crawlController(req: Request, res: Response) {
|
||||
try {
|
||||
@ -112,8 +113,7 @@ export async function crawlController(req: Request, res: Response) {
|
||||
|
||||
if (isUrlBlocked(url)) {
|
||||
return res.status(403).json({
|
||||
error:
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
error: BLOCKLISTED_URL_MESSAGE,
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -15,6 +15,7 @@ import { addScrapeJob } from "../../../src/services/queue-jobs";
|
||||
import { checkAndUpdateURL } from "../../../src/lib/validateUrl";
|
||||
import * as Sentry from "@sentry/node";
|
||||
import { fromLegacyScrapeOptions } from "../v1/types";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../../lib/strings";
|
||||
|
||||
export async function crawlPreviewController(req: Request, res: Response) {
|
||||
try {
|
||||
@ -42,8 +43,7 @@ export async function crawlPreviewController(req: Request, res: Response) {
|
||||
|
||||
if (isUrlBlocked(url)) {
|
||||
return res.status(403).json({
|
||||
error:
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
error: BLOCKLISTED_URL_MESSAGE,
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -29,6 +29,7 @@ import { getJobPriority } from "../../lib/job-priority";
|
||||
import { fromLegacyScrapeOptions } from "../v1/types";
|
||||
import { ZodError } from "zod";
|
||||
import { Document as V0Document } from "./../../lib/entities";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../../lib/strings";
|
||||
|
||||
export async function scrapeHelper(
|
||||
jobId: string,
|
||||
@ -53,8 +54,7 @@ export async function scrapeHelper(
|
||||
if (isUrlBlocked(url)) {
|
||||
return {
|
||||
success: false,
|
||||
error:
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
error: BLOCKLISTED_URL_MESSAGE,
|
||||
returnCode: 403,
|
||||
};
|
||||
}
|
||||
@ -265,13 +265,15 @@ export async function scrapeController(req: Request, res: Response) {
|
||||
}
|
||||
if (creditsToBeBilled > 0) {
|
||||
// billing for doc done on queue end, bill only for llm extraction
|
||||
billTeam(team_id, chunk?.sub_id, creditsToBeBilled, logger).catch((error) => {
|
||||
logger.error(
|
||||
`Failed to bill team ${team_id} for ${creditsToBeBilled} credits`,
|
||||
{ error }
|
||||
);
|
||||
// Optionally, you could notify an admin or add to a retry queue here
|
||||
});
|
||||
billTeam(team_id, chunk?.sub_id, creditsToBeBilled, logger).catch(
|
||||
(error) => {
|
||||
logger.error(
|
||||
`Failed to bill team ${team_id} for ${creditsToBeBilled} credits`,
|
||||
{ error },
|
||||
);
|
||||
// Optionally, you could notify an admin or add to a retry queue here
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
import { url } from "../types";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../../../lib/strings";
|
||||
|
||||
describe("URL Schema Validation", () => {
|
||||
beforeEach(() => {
|
||||
@ -31,7 +32,7 @@ describe("URL Schema Validation", () => {
|
||||
|
||||
it("should reject blocked URLs", () => {
|
||||
expect(() => url.parse("https://facebook.com")).toThrow(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
BLOCKLISTED_URL_MESSAGE,
|
||||
);
|
||||
});
|
||||
|
||||
@ -47,16 +48,16 @@ describe("URL Schema Validation", () => {
|
||||
|
||||
it("should handle URLs with subdomains that are blocked", () => {
|
||||
expect(() => url.parse("https://sub.facebook.com")).toThrow(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
BLOCKLISTED_URL_MESSAGE,
|
||||
);
|
||||
});
|
||||
|
||||
it("should handle URLs with paths that are blocked", () => {
|
||||
expect(() => url.parse("http://facebook.com/path")).toThrow(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
BLOCKLISTED_URL_MESSAGE,
|
||||
);
|
||||
expect(() => url.parse("https://facebook.com/another/path")).toThrow(
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
BLOCKLISTED_URL_MESSAGE,
|
||||
);
|
||||
});
|
||||
|
||||
|
45
apps/api/src/controllers/v1/credit-usage.ts
Normal file
45
apps/api/src/controllers/v1/credit-usage.ts
Normal file
@ -0,0 +1,45 @@
|
||||
import { Request, Response } from "express";
|
||||
import { RequestWithAuth } from "./types";
|
||||
import { getACUC } from "../auth";
|
||||
import { logger } from "../../lib/logger";
|
||||
|
||||
export async function creditUsageController(
|
||||
req: RequestWithAuth,
|
||||
res: Response,
|
||||
): Promise<void> {
|
||||
try {
|
||||
// If we already have the credit usage info from auth, use it
|
||||
if (req.acuc) {
|
||||
res.json({
|
||||
success: true,
|
||||
data: {
|
||||
remaining_credits: req.acuc.remaining_credits,
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// Otherwise fetch fresh data
|
||||
const chunk = await getACUC(req.auth.team_id);
|
||||
if (!chunk) {
|
||||
res.status(404).json({
|
||||
success: false,
|
||||
error: "Could not find credit usage information",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
data: {
|
||||
remaining_credits: chunk.remaining_credits,
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
logger.error("Error in credit usage controller:", error);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: "Internal server error while fetching credit usage",
|
||||
});
|
||||
}
|
||||
}
|
@ -92,19 +92,18 @@ export async function extractController(
|
||||
let mappedLinks = mapResults.mapResults as MapDocument[];
|
||||
|
||||
// Remove duplicates between mapResults.links and mappedLinks
|
||||
const allUrls = [...mappedLinks.map(m => m.url), ...mapResults.links];
|
||||
const allUrls = [...mappedLinks.map((m) => m.url), ...mapResults.links];
|
||||
const uniqueUrls = removeDuplicateUrls(allUrls);
|
||||
|
||||
|
||||
// Only add URLs from mapResults.links that aren't already in mappedLinks
|
||||
const existingUrls = new Set(mappedLinks.map(m => m.url));
|
||||
const newUrls = uniqueUrls.filter(url => !existingUrls.has(url));
|
||||
|
||||
const existingUrls = new Set(mappedLinks.map((m) => m.url));
|
||||
const newUrls = uniqueUrls.filter((url) => !existingUrls.has(url));
|
||||
|
||||
mappedLinks = [
|
||||
...mappedLinks,
|
||||
...newUrls.map(url => ({ url, title: "", description: "" }))
|
||||
...newUrls.map((url) => ({ url, title: "", description: "" })),
|
||||
];
|
||||
|
||||
|
||||
if (mappedLinks.length === 0) {
|
||||
mappedLinks = [{ url: baseUrl, title: "", description: "" }];
|
||||
}
|
||||
@ -117,7 +116,6 @@ export async function extractController(
|
||||
`url: ${x.url}, title: ${x.title}, description: ${x.description}`,
|
||||
);
|
||||
|
||||
|
||||
if (req.body.prompt) {
|
||||
let searchQuery =
|
||||
req.body.prompt && allowExternalLinks
|
||||
|
@ -11,6 +11,7 @@ import {
|
||||
Document as V0Document,
|
||||
} from "../../lib/entities";
|
||||
import { InternalOptions } from "../../scraper/scrapeURL";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../../lib/strings";
|
||||
|
||||
export type Format =
|
||||
| "markdown"
|
||||
@ -44,10 +45,7 @@ export const url = z.preprocess(
|
||||
return false;
|
||||
}
|
||||
}, "Invalid URL")
|
||||
.refine(
|
||||
(x) => !isUrlBlocked(x as string),
|
||||
"Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it.",
|
||||
),
|
||||
.refine((x) => !isUrlBlocked(x as string), BLOCKLISTED_URL_MESSAGE),
|
||||
);
|
||||
|
||||
const strictMessage =
|
||||
|
2
apps/api/src/lib/strings.ts
Normal file
2
apps/api/src/lib/strings.ts
Normal file
@ -0,0 +1,2 @@
|
||||
export const BLOCKLISTED_URL_MESSAGE =
|
||||
"This website is no longer supported, please reach out to help@firecrawl.com for more info on how to activate it on your account.";
|
@ -71,7 +71,7 @@ export async function runWebScraper({
|
||||
module: "runWebscraper",
|
||||
scrapeId: bull_job_id,
|
||||
jobId: bull_job_id,
|
||||
})
|
||||
});
|
||||
const tries = is_crawl ? 3 : 1;
|
||||
|
||||
let response: ScrapeUrlResponse | undefined = undefined;
|
||||
@ -176,7 +176,7 @@ export async function runWebScraper({
|
||||
billTeam(team_id, undefined, creditsToBeBilled, logger).catch((error) => {
|
||||
logger.error(
|
||||
`Failed to bill team ${team_id} for ${creditsToBeBilled} credits`,
|
||||
{ error }
|
||||
{ error },
|
||||
);
|
||||
// Optionally, you could notify an admin or add to a retry queue here
|
||||
});
|
||||
|
@ -31,6 +31,8 @@ import { extractController } from "../controllers/v1/extract";
|
||||
// import { keyAuthController } from "../../src/controllers/v1/keyAuth";
|
||||
// import { livenessController } from "../controllers/v1/liveness";
|
||||
// import { readinessController } from "../controllers/v1/readiness";
|
||||
import { creditUsageController } from "../controllers/v1/credit-usage";
|
||||
import { BLOCKLISTED_URL_MESSAGE } from "../lib/strings";
|
||||
|
||||
function checkCreditsMiddleware(
|
||||
minimum?: number,
|
||||
@ -122,8 +124,7 @@ function blocklistMiddleware(req: Request, res: Response, next: NextFunction) {
|
||||
if (!res.headersSent) {
|
||||
return res.status(403).json({
|
||||
success: false,
|
||||
error:
|
||||
"URL is blocked intentionally. Firecrawl currently does not support scraping this site due to policy restrictions.",
|
||||
error: BLOCKLISTED_URL_MESSAGE,
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -224,3 +225,9 @@ v1Router.delete(
|
||||
// Health/Probe routes
|
||||
// v1Router.get("/health/liveness", livenessController);
|
||||
// v1Router.get("/health/readiness", readinessController);
|
||||
|
||||
v1Router.get(
|
||||
"/team/credit-usage",
|
||||
authMiddleware(RateLimiterMode.CrawlStatus),
|
||||
wrap(creditUsageController),
|
||||
);
|
||||
|
@ -44,7 +44,10 @@ export async function supaBillTeam(
|
||||
if (team_id === "preview") {
|
||||
return { success: true, message: "Preview team, no credits used" };
|
||||
}
|
||||
_logger.info(`Billing team ${team_id} for ${credits} credits`, { team_id, credits });
|
||||
_logger.info(`Billing team ${team_id} for ${credits} credits`, {
|
||||
team_id,
|
||||
credits,
|
||||
});
|
||||
|
||||
const { data, error } = await supabase_service.rpc("bill_team", {
|
||||
_team_id: team_id,
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@mendable/firecrawl-js",
|
||||
"version": "1.9.7",
|
||||
"version": "1.9.8",
|
||||
"description": "JavaScript SDK for Firecrawl API",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
@ -159,12 +159,6 @@ describe('FirecrawlApp E2E Tests', () => {
|
||||
await expect(invalidApp.crawlUrl('https://roastmywebsite.ai')).rejects.toThrow("Request failed with status code 401");
|
||||
});
|
||||
|
||||
test.concurrent('should throw error for blocklisted URL on crawl', async () => {
|
||||
const app = new FirecrawlApp({ apiKey: TEST_API_KEY, apiUrl: API_URL });
|
||||
const blocklistedUrl = "https://twitter.com/fake-test";
|
||||
await expect(app.crawlUrl(blocklistedUrl)).rejects.toThrow("Request failed with status code 403. Error: This website is no longer supported, please reach out to help@firecrawl.com for more info on how to activate it on your account. ");
|
||||
});
|
||||
|
||||
test.concurrent('should return successful response for crawl and wait for completion', async () => {
|
||||
const app = new FirecrawlApp({ apiKey: TEST_API_KEY, apiUrl: API_URL });
|
||||
const response = await app.crawlUrl('https://roastmywebsite.ai', {}, 30) as CrawlStatusResponse;
|
||||
|
@ -1027,14 +1027,21 @@ export class CrawlWatcher extends TypedEventTarget<CrawlWatcherEvents> {
|
||||
this.ws.close();
|
||||
return;
|
||||
}
|
||||
|
||||
const msg = JSON.parse(ev.data) as Message;
|
||||
messageHandler(msg);
|
||||
try {
|
||||
const msg = JSON.parse(ev.data) as Message;
|
||||
messageHandler(msg);
|
||||
} catch (error) {
|
||||
console.error("Error on message", error);
|
||||
}
|
||||
}).bind(this);
|
||||
|
||||
this.ws.onclose = ((ev: CloseEvent) => {
|
||||
const msg = JSON.parse(ev.reason) as Message;
|
||||
messageHandler(msg);
|
||||
try {
|
||||
const msg = JSON.parse(ev.reason) as Message;
|
||||
messageHandler(msg);
|
||||
} catch (error) {
|
||||
console.error("Error on close", error);
|
||||
}
|
||||
}).bind(this);
|
||||
|
||||
this.ws.onerror = ((_: Event) => {
|
||||
|
@ -29,12 +29,12 @@ def test_scrape_url_invalid_api_key():
|
||||
invalid_app.scrape_url('https://firecrawl.dev')
|
||||
assert "Unexpected error during scrape URL: Status code 401. Unauthorized: Invalid token" in str(excinfo.value)
|
||||
|
||||
def test_blocklisted_url():
|
||||
blocklisted_url = "https://facebook.com/fake-test"
|
||||
app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY, version='v0')
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
app.scrape_url(blocklisted_url)
|
||||
assert "Unexpected error during scrape URL: Status code 403. Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it." in str(excinfo.value)
|
||||
# def test_blocklisted_url():
|
||||
# blocklisted_url = "https://facebook.com/fake-test"
|
||||
# app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY, version='v0')
|
||||
# with pytest.raises(Exception) as excinfo:
|
||||
# app.scrape_url(blocklisted_url)
|
||||
# assert "Unexpected error during scrape URL: Status code 403. Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it." in str(excinfo.value)
|
||||
|
||||
def test_successful_response_with_valid_preview_token():
|
||||
app = FirecrawlApp(api_url=API_URL, api_key="this_is_just_a_preview_token", version='v0')
|
||||
@ -90,12 +90,12 @@ def test_crawl_url_invalid_api_key():
|
||||
invalid_app.crawl_url('https://firecrawl.dev')
|
||||
assert "Unexpected error during start crawl job: Status code 401. Unauthorized: Invalid token" in str(excinfo.value)
|
||||
|
||||
def test_should_return_error_for_blocklisted_url():
|
||||
app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY, version='v0')
|
||||
blocklisted_url = "https://twitter.com/fake-test"
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
app.crawl_url(blocklisted_url)
|
||||
assert "Unexpected error during start crawl job: Status code 403. Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it." in str(excinfo.value)
|
||||
# def test_should_return_error_for_blocklisted_url():
|
||||
# app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY, version='v0')
|
||||
# blocklisted_url = "https://twitter.com/fake-test"
|
||||
# with pytest.raises(Exception) as excinfo:
|
||||
# app.crawl_url(blocklisted_url)
|
||||
# assert "Unexpected error during start crawl job: Status code 403. Firecrawl currently does not support social media scraping due to policy restrictions. We're actively working on building support for it." in str(excinfo.value)
|
||||
|
||||
def test_crawl_url_wait_for_completion_e2e():
|
||||
app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY, version='v0')
|
||||
|
@ -30,12 +30,12 @@ def test_scrape_url_invalid_api_key():
|
||||
invalid_app.scrape_url('https://firecrawl.dev')
|
||||
assert "Unauthorized: Invalid token" in str(excinfo.value)
|
||||
|
||||
def test_blocklisted_url():
|
||||
blocklisted_url = "https://facebook.com/fake-test"
|
||||
app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY)
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
app.scrape_url(blocklisted_url)
|
||||
assert "URL is blocked. Firecrawl currently does not support social media scraping due to policy restrictions." in str(excinfo.value)
|
||||
# def test_blocklisted_url():
|
||||
# blocklisted_url = "https://facebook.com/fake-test"
|
||||
# app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY)
|
||||
# with pytest.raises(Exception) as excinfo:
|
||||
# app.scrape_url(blocklisted_url)
|
||||
# assert "URL is blocked. Firecrawl currently does not support social media scraping due to policy restrictions." in str(excinfo.value)
|
||||
|
||||
def test_successful_response_with_valid_preview_token():
|
||||
app = FirecrawlApp(api_url=API_URL, api_key="this_is_just_a_preview_token")
|
||||
@ -136,12 +136,12 @@ def test_crawl_url_invalid_api_key():
|
||||
invalid_app.crawl_url('https://firecrawl.dev')
|
||||
assert "Unauthorized: Invalid token" in str(excinfo.value)
|
||||
|
||||
def test_should_return_error_for_blocklisted_url():
|
||||
app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY)
|
||||
blocklisted_url = "https://twitter.com/fake-test"
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
app.crawl_url(blocklisted_url)
|
||||
assert "URL is blocked. Firecrawl currently does not support social media scraping due to policy restrictions." in str(excinfo.value)
|
||||
# def test_should_return_error_for_blocklisted_url():
|
||||
# app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY)
|
||||
# blocklisted_url = "https://twitter.com/fake-test"
|
||||
# with pytest.raises(Exception) as excinfo:
|
||||
# app.crawl_url(blocklisted_url)
|
||||
# assert "URL is blocked. Firecrawl currently does not support social media scraping due to policy restrictions." in str(excinfo.value)
|
||||
|
||||
def test_crawl_url_wait_for_completion_e2e():
|
||||
app = FirecrawlApp(api_url=API_URL, api_key=TEST_API_KEY)
|
||||
@ -296,12 +296,12 @@ def test_invalid_api_key_on_map():
|
||||
invalid_app.map_url('https://roastmywebsite.ai')
|
||||
assert "Unauthorized: Invalid token" in str(excinfo.value)
|
||||
|
||||
def test_blocklisted_url_on_map():
|
||||
app = FirecrawlApp(api_key=TEST_API_KEY, api_url=API_URL)
|
||||
blocklisted_url = "https://facebook.com/fake-test"
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
app.map_url(blocklisted_url)
|
||||
assert "URL is blocked. Firecrawl currently does not support social media scraping due to policy restrictions." in str(excinfo.value)
|
||||
# def test_blocklisted_url_on_map():
|
||||
# app = FirecrawlApp(api_key=TEST_API_KEY, api_url=API_URL)
|
||||
# blocklisted_url = "https://facebook.com/fake-test"
|
||||
# with pytest.raises(Exception) as excinfo:
|
||||
# app.map_url(blocklisted_url)
|
||||
# assert "URL is blocked. Firecrawl currently does not support social media scraping due to policy restrictions." in str(excinfo.value)
|
||||
|
||||
def test_successful_response_with_valid_preview_token_on_map():
|
||||
app = FirecrawlApp(api_key="this_is_just_a_preview_token", api_url=API_URL)
|
||||
|
@ -5,20 +5,20 @@ use firecrawl::FirecrawlApp;
|
||||
use serde_json::json;
|
||||
use std::env;
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_blocklisted_url() {
|
||||
dotenv().ok();
|
||||
let api_url = env::var("API_URL").unwrap();
|
||||
let api_key = env::var("TEST_API_KEY").ok();
|
||||
let app = FirecrawlApp::new_selfhosted(api_url, api_key).unwrap();
|
||||
let blocklisted_url = "https://facebook.com/fake-test";
|
||||
let result = app.scrape_url(blocklisted_url, None).await;
|
||||
// #[tokio::test]
|
||||
// async fn test_blocklisted_url() {
|
||||
// dotenv().ok();
|
||||
// let api_url = env::var("API_URL").unwrap();
|
||||
// let api_key = env::var("TEST_API_KEY").ok();
|
||||
// let app = FirecrawlApp::new_selfhosted(api_url, api_key).unwrap();
|
||||
// let blocklisted_url = "https://facebook.com/fake-test";
|
||||
// let result = app.scrape_url(blocklisted_url, None).await;
|
||||
|
||||
assert_matches!(
|
||||
result,
|
||||
Err(e) if e.to_string().contains("Firecrawl currently does not support social media scraping due to policy restrictions")
|
||||
);
|
||||
}
|
||||
// assert_matches!(
|
||||
// result,
|
||||
// Err(e) if e.to_string().contains("Firecrawl currently does not support social media scraping due to policy restrictions")
|
||||
// );
|
||||
// }
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_successful_response_with_valid_preview_token() {
|
||||
@ -103,20 +103,21 @@ async fn test_successful_response_for_valid_scrape_with_pdf_file_without_explici
|
||||
.contains("We present spectrophotometric observations of the Broad Line Radio Galaxy"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_should_return_error_for_blocklisted_url() {
|
||||
dotenv().ok();
|
||||
let api_url = env::var("API_URL").unwrap();
|
||||
let api_key = env::var("TEST_API_KEY").ok();
|
||||
let app = FirecrawlApp::new_selfhosted(api_url, api_key).unwrap();
|
||||
let blocklisted_url = "https://twitter.com/fake-test";
|
||||
let result = app.crawl_url(blocklisted_url, None).await;
|
||||
|
||||
assert_matches!(
|
||||
result,
|
||||
Err(e) if e.to_string().contains("Firecrawl currently does not support social media scraping due to policy restrictions.")
|
||||
);
|
||||
}
|
||||
// #[tokio::test]
|
||||
// async fn test_should_return_error_for_blocklisted_url() {
|
||||
// dotenv().ok();
|
||||
// let api_url = env::var("API_URL").unwrap();
|
||||
// let api_key = env::var("TEST_API_KEY").ok();
|
||||
// let app = FirecrawlApp::new_selfhosted(api_url, api_key).unwrap();
|
||||
// let blocklisted_url = "https://twitter.com/fake-test";
|
||||
// let result = app.crawl_url(blocklisted_url, None).await;
|
||||
|
||||
// assert_matches!(
|
||||
// result,
|
||||
// Err(e) if e.to_string().contains("Firecrawl currently does not support social media scraping due to policy restrictions.")
|
||||
// );
|
||||
// }
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_llm_extraction() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user