feat: add booking date range filters and freeze GPT-4 version by DexterStorey · Pull Request #12508 · calcom/cal.diy

DexterStorey · 2023-11-23T05:08:18Z

What does this PR do?

This PR adds optional filtering by date to the Cal.com consumer API, and integration with cal.ai.

It fixes a problem where many accounts can't access the getBookings route since they have historical buggy data - and the consumer API previously fetched all booking ever, leading to errors.

We now add the option to fetch booking within a range.

Partially Fixes #11957 (issue)

Additionally, this pr freezes the GPT-4 model (gpt-4-0613) version in an attempt to prevent model degradation.

Requirement/Documentation

Type of change

Bug fix (non-breaking change which fixes an issue)
Chore (refactoring code, technical debt, workflow improvements)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

How should this be tested?

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

Checklist

~~I haven't read the contributing guide~~
~~My code doesn't follow the style guidelines of this project~~
I haven't commented my code, particularly in hard-to-understand areas
I haven't checked if my PR needs changes to the documentation
I haven't checked if my changes generate no new warnings
I haven't added tests that prove my fix is effective or that my feature works
I haven't checked if new and existing unit tests pass locally with my changes

vercel · 2023-11-23T05:08:24Z

@DexterStorey is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2023-11-23T05:08:32Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

github-actions · 2023-11-23T05:16:05Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

github-actions · 2023-12-08T00:17:01Z

This PR is being marked as stale due to inactivity.

github-actions · 2023-12-15T00:17:19Z

This PR is being closed due to inactivity. Please reopen if work is intended to be continued.

DexterStorey · 2023-12-20T03:36:21Z

Tested and fixed!
This seems to work now.

When I go to: http://localhost:3002/bookings?dateFrom=2023-12-20T16:00:00Z&dateTo=2023-12-20T16:15:00Z&apiKey=API_KEY

I can see the booking:

But with: http://localhost:3002/bookings?dateFrom=2023-12-20T16:00:00Z&dateTo=2023-12-20T16:14:00Z&apiKey=API_KEY

It is hidden

With no dateFrom or dateTo passed, the api query responds normally, so in theory this is purely additive / optional.

http://localhost:3002/bookings?apiKey=API_KEY

DexterStorey · 2023-12-20T03:41:28Z

🚀 This should fix #11957
Docs should probably be updated as we now have a new feature for the getBookings API (dateFrom, dateTo) which filters bookings by date.

alishaz-polymath

Temporal filters are quite handy, thank you for the PR 🙏
Left a change request which I think should improve code quality

alishaz-polymath

Just a NIT, although your changes should are already better, this would just be much cleaner and easier to read. 🙌

Testing something

alishaz-polymath · 2023-12-21T12:55:16Z

+  const dateFrom = req.query.dateFrom ? new Date(req.query.dateFrom as string) : undefined;
+  const dateTo = req.query.dateTo ? new Date(req.query.dateTo as string) : undefined;


Apologies for missing this earlier, I think we need to put these in try catch and return a viable error message instead of the generic

{ "message": "An error occured while querying the database." }

that you'd get right now if you pass invalid dateFrom and/or dateTo. Wrapping them up in a try catch, or better yet, pull out a reusable function that validates while parsing these inputs would be awesome 🙌

Once these changes are in, it should be good to go 🙏

Hey @DexterStorey did you manage to get a chance to have a look ^?

Hi @alishaz-polymath. I pushed some changes! 🤝

github-actions · 2024-01-05T00:17:04Z

This PR is being marked as stale due to inactivity.

Freeze GPT-4-0613

DexterStorey · 2024-01-08T21:16:23Z

+export const schemaBookingGetParams = z.object({
+  dateFrom: iso8601.optional(),
+  dateTo: iso8601.optional(),
+});
+


support schema parsing for the bookings get api

DexterStorey · 2024-01-08T21:16:40Z

 async function handler(req: NextApiRequest) {
  const { userId, isAdmin, prisma } = req;
+
+  const { dateFrom, dateTo } = schemaBookingGetParams.parse(req.query);


@alishaz-polymath can you take a look at this?

alishaz-polymath · 2024-01-15T11:52:05Z

 import now from "./now";

-const gptModel = "gpt-4";
+const gptModel = "gpt-4-0613";


Is there any specific reason why we picked this Model exaclty? Additional context would be really helpful

It's the latest stable version released on June 13 AKA 0613 (:
https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo

alishaz-polymath

Looks good, thank you @DexterStorey 🚀

add booking date range filters

4e36cf0

github-actions Bot added ai area: AI, cal.ai api area: API, enterprise API, access token, OAuth Medium priority Created by Linear-GitHub Sync 🐛 bug Something isn't working labels Nov 23, 2023

DexterStorey changed the title ~~Feat: Add booking date range filters~~ feat: add booking date range filters Nov 23, 2023

PeerRich requested review from alishaz-polymath and emrysal November 23, 2023 11:52

github-actions Bot added the Stale label Dec 8, 2023

github-actions Bot closed this Dec 15, 2023

alishaz-polymath reopened this Dec 15, 2023

PeerRich marked this pull request as ready for review December 15, 2023 04:40

github-actions Bot removed the Stale label Dec 16, 2023

DexterStorey and others added 2 commits December 19, 2023 21:13

Merge branch 'calcom:main' into main

fe26943

fix dateFrom, dateTo strings

72d05af

PeerRich enabled auto-merge (squash) December 20, 2023 04:19

alishaz-polymath requested changes Dec 20, 2023

View reviewed changes

Comment thread apps/api/pages/api/bookings/_get.ts Outdated

simplify temporal filters

89daa34

auto-merge was automatically disabled December 20, 2023 18:43
Head branch was pushed to by a user without write access

DexterStorey commented Dec 20, 2023

View reviewed changes

Comment thread apps/api/pages/api/bookings/_get.ts

Merge branch 'main' into main

c2d53e0

DexterStorey requested a review from alishaz-polymath December 20, 2023 18:50

alishaz-polymath requested changes Dec 20, 2023

View reviewed changes

Comment thread apps/api/pages/api/bookings/_get.ts

Freeze GPT-4-0613

aba322c

DexterStorey requested a review from alishaz-polymath December 20, 2023 22:53

exception previously approved these changes Dec 21, 2023

View reviewed changes

This comment was marked as outdated.

Sign in to view

alishaz-polymath requested changes Dec 21, 2023

View reviewed changes

github-actions Bot added Stale and removed Stale labels Jan 5, 2024

Merge pull request #10 from RubricLab/GPT-4-DEGRADATION

1570d2b

Freeze GPT-4-0613

DexterStorey dismissed exception’s stale review via 1570d2b January 8, 2024 19:31

github-actions Bot added the Stale label Jan 8, 2024

Merge branch 'calcom:main' into main

e941a35

DexterStorey changed the title ~~feat: add booking date range filters~~ feat: add booking date range filters and freeze GPT-4 version Jan 8, 2024

DexterStorey added 2 commits January 8, 2024 15:46

parse and validate booking dateFrom and dateTo fields

dfd699b

add weekday to agent prompt

682de5f

DexterStorey commented Jan 8, 2024

View reviewed changes

DexterStorey requested a review from alishaz-polymath January 8, 2024 23:28

github-actions Bot removed the Stale label Jan 9, 2024

keithwillcode added this to the v3.7 milestone Jan 10, 2024

keithwillcode added the community Created by Linear-GitHub Sync label Jan 11, 2024

alishaz-polymath reviewed Jan 15, 2024

View reviewed changes

alishaz-polymath approved these changes Jan 15, 2024

View reviewed changes

keithwillcode modified the milestones: v3.7, v3.8 Jan 15, 2024

PeerRich merged commit fd3fffd into calcom:main Jan 16, 2024

		const dateFrom = req.query.dateFrom ? new Date(req.query.dateFrom as string) : undefined;
		const dateTo = req.query.dateTo ? new Date(req.query.dateTo as string) : undefined;

Conversation

DexterStorey commented Nov 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Requirement/Documentation

Type of change

How should this be tested?

Mandatory Tasks

Checklist

Uh oh!

vercel Bot commented Nov 23, 2023

Uh oh!

github-actions Bot commented Nov 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Nov 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Uh oh!

github-actions Bot commented Dec 8, 2023

Uh oh!

github-actions Bot commented Dec 15, 2023

Uh oh!

DexterStorey commented Dec 20, 2023

Uh oh!

DexterStorey commented Dec 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alishaz-polymath left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

alishaz-polymath left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jan 5, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alishaz-polymath left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

DexterStorey commented Nov 23, 2023 •

edited

Loading

github-actions Bot commented Nov 23, 2023 •

edited

Loading

github-actions Bot commented Nov 23, 2023 •

edited

Loading

DexterStorey commented Dec 20, 2023 •

edited

Loading