Skip to content

Fix OpenSource Observer queries #3596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2024
Merged

Fix OpenSource Observer queries #3596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50b5453
update query to use latest oso models
MasterHW Aug 9, 2024
fe4e8ea
fixes
Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions packages/grant-explorer/src/features/api/oso.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ const graphQLClient = new GraphQLClient(osoUrl, {
let hasFetched = false;

interface IOSOId {
artifacts_by_project: {
projects_v1: {
project_id: Hex;
};
}

export interface IOSOStats {
code_metrics_by_project: {
contributors: number;
code_metrics_by_project_v1: {
contributor_count: number;
first_commit_date: number;
};
events_monthly_to_project: [
Expand Down Expand Up @@ -53,8 +53,8 @@ export interface IOSOStats {

export function useOSO(projectGithub?: string) {
const emptyReturn: IOSOStats = {
code_metrics_by_project: {
contributors: 0,
code_metrics_by_project_v1: {
contributor_count: 0,
first_commit_date: 0,
},
events_monthly_to_project: [
Expand Down Expand Up @@ -90,7 +90,7 @@ export function useOSO(projectGithub?: string) {
if (osoApiKey === "")
throw new Error("OpenSourceObserver API key not set.");
const queryId = gql`{
artifacts_by_project(where: {artifact_name: {_ilike: "%${projectRegistryGithub}/%"}}
projects_v1(where: {display_name: {_ilike: "${projectRegistryGithub}"}}
distinct_on: project_id
) {
project_id
Expand All @@ -101,22 +101,22 @@ export function useOSO(projectGithub?: string) {
hasFetched = true;
const idData: IOSOId = await graphQLClient.request<IOSOId>(queryId);

if (!Array.isArray(idData.artifacts_by_project)) {
if (!Array.isArray(idData.projects_v1)) {
setStats(emptyReturn);
return;
}

const parsedId: IOSOId = {
artifacts_by_project: idData.artifacts_by_project[0],
projects_v1: idData.projects_v1[0],
};

const queryStats = gql`{
code_metrics_by_project(where: {project_id: {_eq: "${parsedId.artifacts_by_project.project_id}"}}) {
contributors
code_metrics_by_project_v1(where: {project_id: {_eq: "${parsedId.projects_v1.project_id}"}}) {
contributor_count
first_commit_date
}
events_monthly_to_project(
where: {project_id: {_eq: "${parsedId.artifacts_by_project.project_id}"}, event_type: {_eq: "COMMIT_CODE"}}
where: {project_id: {_eq: "${parsedId.projects_v1.project_id}"}, event_type: {_eq: "COMMIT_CODE"}}
limit: 6
order_by: {bucket_month: desc}
) {
Expand All @@ -128,20 +128,20 @@ export function useOSO(projectGithub?: string) {
const items: IOSOStats =
await graphQLClient.request<IOSOStats>(queryStats);

if (!Array.isArray(items.code_metrics_by_project)) {
if (!Array.isArray(items.code_metrics_by_project_v1)) {
setStats(emptyReturn);
return;
}

if (items.events_monthly_to_project.length === 6) {
const parsedItems: IOSOStats = {
code_metrics_by_project: items.code_metrics_by_project[0],
code_metrics_by_project_v1: items.code_metrics_by_project_v1[0],
events_monthly_to_project: items.events_monthly_to_project,
};
setStats(parsedItems);
} else {
const parsedItems: IOSOStats = {
code_metrics_by_project: items.code_metrics_by_project[0],
code_metrics_by_project_v1: items.code_metrics_by_project_v1[0],
events_monthly_to_project: emptyReturn.events_monthly_to_project,
};
setStats(parsedItems);
Expand Down
78 changes: 42 additions & 36 deletions packages/grant-explorer/src/features/round/OSO/ImpactStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,74 +4,80 @@ import { Flex, Link, Text } from "@chakra-ui/react";
import { Stat } from "../ViewProjectDetails";
import { formatTimeAgo } from "../../common/utils/utils";


export const StatList = ({ stats }: { stats: IOSOStats | null }) => {
if (stats === null) return;
return (
stats.code_metrics_by_project.contributors > 0 ? (
<React.Fragment>
<h4 className="text-3xl mt-5 ml-4" >Impact stats</h4>
<Flex gap={2} flexDir={{base: 'column', md: 'row'}} py={6} px={3} >
<div
className={
return stats.code_metrics_by_project_v1.contributor_count > 0 ? (
<React.Fragment>
<h4 className="text-3xl mt-5 ml-4">Impact stats</h4>
<Flex gap={2} flexDir={{ base: "column", md: "row" }} py={6} px={3}>
<div
className={
"rounded-2xl bg-gray-50 flex-auto p-3 md:p-6 gap-4 flex flex-col"
}
>
<div> <Stat
}
>
<div>
{" "}
<Stat
isLoading={false}
value={`${formatTimeAgo(stats.code_metrics_by_project.first_commit_date)}`}
value={`${formatTimeAgo(stats.code_metrics_by_project_v1.first_commit_date)}`}
>
Project age
</Stat>
</div>
</div>
<div
className={
"rounded-2xl bg-gray-50 flex-auto p-3 md:p-6 gap-4 flex flex-col"
"rounded-2xl bg-gray-50 flex-auto p-3 md:p-6 gap-4 flex flex-col"
}
>
<Stat
isLoading={false}
value={`${stats.code_metrics_by_project.contributors}`}
value={`${stats.code_metrics_by_project_v1.contributor_count}`}
>
Unique code contributors
</Stat>
</div>
<div
<div
className={
"rounded-2xl bg-gray-50 flex-auto p-3 md:p-6 gap-4 flex flex-col"
"rounded-2xl bg-gray-50 flex-auto p-3 md:p-6 gap-4 flex flex-col"
}
>
<Stat
isLoading={false}
value={`${projectVelocity(stats)}`}
>
<Stat isLoading={false} value={`${projectVelocity(stats)}`}>
Velocity
</Stat>
</div>
</Flex>
<Text fontFamily="DM Mono" textAlign="center" mt={0} className={"text-xs"}>
Data provided by {" "}
<Text
fontFamily="DM Mono"
textAlign="center"
mt={0}
className={"text-xs"}
>
Data provided by{" "}
<Link href={"https://www.opensource.observer/"} target="_blank">
<Text as="span" className="text-gitcoin-violet-500">
<Text as="span" className="text-gitcoin-violet-500">
opensource.observer
</Text>
</Link>
</Text>
</React.Fragment>
) : (
<div>
</div>
)
</React.Fragment>
) : (
<div></div>
);
};

function projectVelocity(stats : IOSOStats) {
const recentCommits = stats.events_monthly_to_project[0].amount + stats.events_monthly_to_project[1].amount + stats.events_monthly_to_project[2].amount;
const olderCommits = stats.events_monthly_to_project[3].amount + stats.events_monthly_to_project[4].amount + stats.events_monthly_to_project[5].amount;
function projectVelocity(stats: IOSOStats) {
const recentCommits =
stats.events_monthly_to_project[0].amount +
stats.events_monthly_to_project[1].amount +
stats.events_monthly_to_project[2].amount;
const olderCommits =
stats.events_monthly_to_project[3].amount +
stats.events_monthly_to_project[4].amount +
stats.events_monthly_to_project[5].amount;

if (recentCommits === 0 && olderCommits === 0) return 'unknown';
if (recentCommits >= (1.5 * olderCommits)) return 'increasing';
if (recentCommits <= 0.5 * olderCommits) return 'decreasing';
return 'steady';
}
if (recentCommits === 0 && olderCommits === 0) return "unknown";
if (recentCommits >= 1.5 * olderCommits) return "increasing";
if (recentCommits <= 0.5 * olderCommits) return "decreasing";
return "steady";
}
Loading