refactor: move pypi downloads out of deps-dev

Signed-off-by: anilb <epipav@gmail.com>

Author: epipav

services/apps/packages_worker/src/activities.ts

@@ -30,4 +30,5 @@ export {
   ingestPypiPackageBatch,
   pypiStopAfterFirstPage,
 } from './pypi/activities'
+export { getCriticalPypiCount } from './pypi/downloads/getCriticalPypiCount'
 export { processNuGetBatch } from './nuget/activities'

services/apps/packages_worker/src/bin/bq-dataset-ingest.ts

@@ -2,7 +2,7 @@ import { scheduleOsspckgsBootstrap } from '../deps-dev/schedules/bootstrap'
 import {
   schedulePypiDownloads30d,
   schedulePypiDownloadsDaily,
-} from '../deps-dev/schedules/pypiDownloads'
+} from '../pypi/downloads/pypiDownloads'
 import { svc } from '../service'
 
 setImmediate(async () => {

services/apps/packages_worker/src/deps-dev/activities/index.ts

@@ -1,5 +1,4 @@
 export * from './bqExportToGcs'
-export * from './getCriticalPypiCount'
 export * from './setJobStep'
 export * from './createVersionsLookup'
 export * from './managePackageDepsConstraints'

services/apps/packages_worker/src/deps-dev/workflows/index.ts

@@ -3,6 +3,5 @@ export * from './ingestAdvisories'
 export * from './ingestDependentCounts'
 export * from './ingestDependencies'
 export * from './ingestPackages'
-export * from './ingestPypiDownloads'
 export * from './ingestRepos'
 export * from './ingestVersions'

…/queries/__tests__/pypiDownloads.test.ts …ownloads/__tests__/pypiDownloads.test.tsservices/apps/packages_worker/src/deps-dev/queries/__tests__/pypiDownloads.test.ts renamed to services/apps/packages_worker/src/pypi/downloads/__tests__/pypiDownloads.test.ts services/apps/packages_worker/src/deps-dev/queries/__tests__/pypiDownloads.test.ts renamed to services/apps/packages_worker/src/pypi/downloads/__tests__/pypiDownloads.test.ts

@@ -1,11 +1,13 @@
 import { proxyActivities, workflowInfo } from '@temporalio/workflow'
 
-import type * as depsDevActivities from '../activities'
+import type * as depsDevActivities from '../../deps-dev/activities'
+
+import type * as pypiDownloadsActivities from './getCriticalPypiCount'
 import {
   computeLast30dWindows,
   defaultDailyRange,
   utcFirstOfCurrentMonth,
-} from '../queries/pypiDownloadsDates'
+} from './pypiDownloadsDates'
 import {
   PYPI_DOWNLOADS_30D_KIND,
   PYPI_DOWNLOADS_30D_STAGING,
@@ -15,7 +17,7 @@ import {
   buildPypiDownloads30dSql,
   buildPypiDownloadsDailyMergeSql,
   buildPypiDownloadsDailySql,
-} from '../queries/pypiDownloadsSql'
+} from './pypiDownloadsSql'
 
 const { bqExportToGcs } = proxyActivities<typeof depsDevActivities>({
   startToCloseTimeout: '1 hour',
@@ -38,7 +40,7 @@ const { mergeStagingToTable } = proxyActivities<typeof depsDevActivities>({
   retry: { maximumAttempts: 1 },
 })
 
-const { getCriticalPypiCount } = proxyActivities<typeof depsDevActivities>({
+const { getCriticalPypiCount } = proxyActivities<typeof pypiDownloadsActivities>({
   startToCloseTimeout: '1 minute',
   retry: { maximumAttempts: 3 },
 })

…s-dev/activities/getCriticalPypiCount.ts …c/pypi/downloads/getCriticalPypiCount.tsservices/apps/packages_worker/src/deps-dev/activities/getCriticalPypiCount.ts renamed to services/apps/packages_worker/src/pypi/downloads/getCriticalPypiCount.ts services/apps/packages_worker/src/deps-dev/activities/getCriticalPypiCount.ts renamed to services/apps/packages_worker/src/pypi/downloads/getCriticalPypiCount.ts

@@ -1,7 +1,8 @@
 import { ScheduleAlreadyRunning, ScheduleOverlapPolicy } from '@temporalio/client'
 
 import { svc } from '../../service'
-import { ingestPypiDownloadsDaily, ingestPypiDownloadsLast30d } from '../workflows'
+
+import { ingestPypiDownloadsDaily, ingestPypiDownloadsLast30d } from './ingestPypiDownloads'
 
 // Last-30d downloads for all pypi packages. Runs on the 4th of the month (06:00 UTC) — a few
 // days after the window's end (1st of the month) so the BigQuery partitions have settled. No