Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

feat: update tinybird pipes

Marc Seitzf162840ca877
diff --git a/Pipfile.lock b/Pipfile.lock
index 2115995a..95e47e0b 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -591,12 +591,12 @@
},
"tinybird-cli": {
"hashes": [
- "sha256:28ea7c3f6d92a7ba45f372a46c751acd8d3c2b38b405242f3be162530c64b251",
- "sha256:53a313fcdf4ef285e7c4c677c0c940d429eee2edfbcf2e7defae50b19018ed4d"
+ "sha256:8ad9432898b7ab7866624bfee876c5ce30ec2f4ea30c84ed1c036d5c05a7c9df",
+ "sha256:948c26fb04d359e7b8c66208eb22c06127d032f1e96ba5d2124b1a396ce03571"
],
"index": "pypi",
"markers": "python_version < '3.12' and python_version >= '3.8'",
- "version": "==3.5.0"
+ "version": "==3.6.0"
},
"toposort": {
"hashes": [
diff --git a/lib/tinybird/endpoints/get_page_duration_per_view.pipe b/lib/tinybird/endpoints/get_page_duration_per_view.pipe
index a2c2cf11..ed70f956 100644
--- a/lib/tinybird/endpoints/get_page_duration_per_view.pipe
+++ b/lib/tinybird/endpoints/get_page_duration_per_view.pipe
@@ -1,4 +1,4 @@
-VERSION 3
+VERSION 4
NODE endpoint
SQL >
@@ -7,7 +7,7 @@ SQL >
pageNumber,
SUM(duration) AS sum_duration
FROM
- page_views__v2
+ page_views__v3
WHERE
documentId = {{ String(documentId, required=True) }}
AND viewId = {{ String(viewId, required=True) }}
diff --git a/lib/tinybird/endpoints/get_total_average_page_duration.pipe b/lib/tinybird/endpoints/get_total_average_page_duration.pipe
index ff439a1c..04244728 100644
--- a/lib/tinybird/endpoints/get_total_average_page_duration.pipe
+++ b/lib/tinybird/endpoints/get_total_average_page_duration.pipe
@@ -1,4 +1,4 @@
-VERSION 3
+VERSION 4
NODE endpoint
SQL >
@@ -6,7 +6,7 @@ SQL >
WITH
DistinctDurations AS (
SELECT versionNumber, pageNumber, viewId, SUM(duration) AS distinct_duration
- FROM page_views__v2
+ FROM page_views__v3
WHERE
documentId = {{ String(documentId, required=true) }}
AND time >= {{ Int64(since, required=true) }}
diff --git a/lib/tinybird/endpoints/get_total_dataroom_duration.pipe b/lib/tinybird/endpoints/get_total_dataroom_duration.pipe
new file mode 100644
index 00000000..fcc41ef2
--- /dev/null
+++ b/lib/tinybird/endpoints/get_total_dataroom_duration.pipe
@@ -0,0 +1,17 @@
+VERSION 1
+
+NODE endpoint
+SQL >
+ %
+ SELECT
+ viewId,
+ SUM(duration) AS sum_duration
+ FROM
+ page_views__v3
+ WHERE
+ dataroomId = {{ String(dataroomId, required=true) }}
+ AND time >= {{ Int64(since, required=true) }}
+ AND linkId NOT IN {{ Array(excludedLinkIds, String) }}
+ AND viewId NOT IN {{ Array(excludedViewIds, String) }}
+ GROUP BY
+ viewId
diff --git a/lib/tinybird/pipes.ts b/lib/tinybird/pipes.ts
index 8e7d5459..a226ba37 100644
--- a/lib/tinybird/pipes.ts
+++ b/lib/tinybird/pipes.ts
@@ -5,7 +5,7 @@ import { Tinybird } from "@chronark/zod-bird";
const tb = new Tinybird({ token: process.env.TINYBIRD_TOKEN! });
export const getTotalAvgPageDuration = tb.buildPipe({
- pipe: "get_total_average_page_duration__v3",
+ pipe: "get_total_average_page_duration__v4",
parameters: z.object({
documentId: z.string(),
excludedLinkIds: z.array(z.string()),
@@ -20,7 +20,7 @@ export const getTotalAvgPageDuration = tb.buildPipe({
});
export const getViewPageDuration = tb.buildPipe({
- pipe: "get_page_duration_per_view__v3",
+ pipe: "get_page_duration_per_view__v4",
parameters: z.object({
documentId: z.string(),
viewId: z.string(),
@@ -31,3 +31,17 @@ export const getViewPageDuration = tb.buildPipe({
sum_duration: z.number(),
}),
});
+
+export const getTotalDataroomDuration = tb.buildPipe({
+ pipe: "get_total_dataroom_duration__v1",
+ parameters: z.object({
+ dataroomId: z.string(),
+ excludedLinkIds: z.array(z.string()),
+ excludedViewIds: z.array(z.string()),
+ since: z.number(),
+ }),
+ data: z.object({
+ viewId: z.string(),
+ sum_duration: z.number(),
+ }),
+});
diff --git a/lib/tinybird/publish.ts b/lib/tinybird/publish.ts
index 3918c5fe..992ee743 100644
--- a/lib/tinybird/publish.ts
+++ b/lib/tinybird/publish.ts
@@ -5,13 +5,13 @@ import { Tinybird } from "@chronark/zod-bird";
const tb = new Tinybird({ token: process.env.TINYBIRD_TOKEN! });
export const publishPageView = tb.buildIngestEndpoint({
- datasource: "page_views__v2",
+ datasource: "page_views__v3",
event: z.object({
id: z.string(),
linkId: z.string(),
documentId: z.string(),
viewId: z.string(),
- folderId: z.string().optional(),
+ dataroomId: z.string().optional(),
versionNumber: z.number().int().min(1).max(65535).optional().default(1),
time: z.number().int(),
duration: z.number().int(),
diff --git a/pages/api/record_view.ts b/pages/api/record_view.ts
index 3cde8469..7110f7d2 100644
--- a/pages/api/record_view.ts
+++ b/pages/api/record_view.ts
@@ -13,7 +13,7 @@ const bodyValidation = z.object({
linkId: z.string(),
documentId: z.string(),
viewId: z.string(),
- folderId: z.string().optional(),
+ dataroomId: z.string().optional(),
versionNumber: z.number().int().optional(),
time: z.number().int(),
duration: z.number().int(),