@zodic/shared 0.0.401 → 0.0.402

package/db/migrations/meta/_journal.json

@@ -5,162 +5,8 @@
     {
       "idx": 0,
       "version": "6",
-      "when": 1739835511480,
-      "tag": "0000_little_sleeper",
-      "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "6",
-      "when": 1740077328339,
-      "tag": "0001_mysterious_mystique",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "6",
-      "when": 1740175232182,
-      "tag": "0002_reflective_firelord",
-      "breakpoints": true
-    },
-    {
-      "idx": 3,
-      "version": "6",
-      "when": 1740256286190,
-      "tag": "0003_thin_valeria_richards",
-      "breakpoints": true
-    },
-    {
-      "idx": 4,
-      "version": "6",
-      "when": 1742042357823,
-      "tag": "0004_loose_iron_monger",
-      "breakpoints": true
-    },
-    {
-      "idx": 5,
-      "version": "6",
-      "when": 1742419128409,
-      "tag": "0005_famous_cammi",
-      "breakpoints": true
-    },
-    {
-      "idx": 6,
-      "version": "6",
-      "when": 1742576766950,
-      "tag": "0006_fine_manta",
-      "breakpoints": true
-    },
-    {
-      "idx": 7,
-      "version": "6",
-      "when": 1742661456728,
-      "tag": "0007_typical_grim_reaper",
-      "breakpoints": true
-    },
-    {
-      "idx": 8,
-      "version": "6",
-      "when": 1742663641761,
-      "tag": "0008_fine_betty_brant",
-      "breakpoints": true
-    },
-    {
-      "idx": 9,
-      "version": "6",
-      "when": 1742960145356,
-      "tag": "0009_spooky_doctor_spectrum",
-      "breakpoints": true
-    },
-    {
-      "idx": 10,
-      "version": "6",
-      "when": 1743532594156,
-      "tag": "0010_tricky_lord_hawal",
-      "breakpoints": true
-    },
-    {
-      "idx": 11,
-      "version": "6",
-      "when": 1743535219441,
-      "tag": "0011_hard_king_bedlam",
-      "breakpoints": true
-    },
-    {
-      "idx": 12,
-      "version": "6",
-      "when": 1743545371795,
-      "tag": "0012_sudden_doctor_spectrum",
-      "breakpoints": true
-    },
-    {
-      "idx": 13,
-      "version": "6",
-      "when": 1743645500734,
-      "tag": "0013_lean_frightful_four",
-      "breakpoints": true
-    },
-    {
-      "idx": 14,
-      "version": "6",
-      "when": 1744920245024,
-      "tag": "0014_green_marvel_apes",
-      "breakpoints": true
-    },
-    {
-      "idx": 15,
-      "version": "6",
-      "when": 1745556069821,
-      "tag": "0015_zippy_sersi",
-      "breakpoints": true
-    },
-    {
-      "idx": 16,
-      "version": "6",
-      "when": 1745725919445,
-      "tag": "0016_awesome_squadron_sinister",
-      "breakpoints": true
-    },
-    {
-      "idx": 17,
-      "version": "6",
-      "when": 1745948199947,
-      "tag": "0017_vengeful_electro",
-      "breakpoints": true
-    },
-    {
-      "idx": 18,
-      "version": "6",
-      "when": 1745953419029,
-      "tag": "0018_wooden_sersi",
-      "breakpoints": true
-    },
-    {
-      "idx": 19,
-      "version": "6",
-      "when": 1747277149960,
-      "tag": "0019_abandoned_orphan",
-      "breakpoints": true
-    },
-    {
-      "idx": 20,
-      "version": "6",
-      "when": 1747599943965,
-      "tag": "0020_smiling_blob",
-      "breakpoints": true
-    },
-    {
-      "idx": 21,
-      "version": "6",
-      "when": 1747600243276,
-      "tag": "0021_flawless_wallflower",
-      "breakpoints": true
-    },
-    {
-      "idx": 22,
-      "version": "6",
-      "when": 1747798482763,
-      "tag": "0022_pale_marvex",
+      "when": 1748314522650,
+      "tag": "0000_workable_the_hand",
       "breakpoints": true
     }
   ]

package/db/schema.ts

@@ -177,24 +177,6 @@ export const usersTemp = sqliteTable(
   (t) => [index('users_temp_email_idx').on(t.email)]
 );
 
-export const creditsTransactions = sqliteTable(
-  'credits_transactions',
-  {
-    id: text('id').primaryKey(), // Transaction ID
-    userId: text('user_id')
-      .notNull()
-      .references(() => users.id, { onDelete: 'cascade' }),
-    type: text('type').notNull(), // e.g., "purchase", "spend", "refund"
-    amount: integer('amount').notNull(), // Positive for additions, negative for deductions
-    description: text('description'), // Optional description (e.g., "Spent on Cosmic Mirror")
-    productType: text('product_type'), // e.g., "concept", "artifact", "astrology_report"
-    productId: text('product_id'), // Corresponding ID for the product (concept_id, artifact_id, etc.)
-    paymentId: text('payment_id').notNull(), // References the payment for purchases
-    ...timestampFields,
-  },
-  (t) => [index('credits_transactions_user_id_idx').on(t.userId)]
-);
-
 export const astroPlanets = sqliteTable(
   'astro_planets',
   {
@@ -239,7 +221,6 @@ export const astroFeatures = sqliteTable(
     name: text('name').notNull(), // e.g., "Fire", "Mutable", "First Quarter Moon"
     description: text('description'), // Detailed description
     percentage: real('percentage'), // For elements, modes, dominant sign
-    order: integer('order'), // For consistent display order
     prominentId: integer('prominent_id'), // NEW: Highlighted option index (1-based)
   },
   (t) => [index('astro_features_user_id_idx').on(t.userId)]
@@ -525,18 +506,6 @@ export const archetypesData = sqliteTable(
   ]
 );
 
-export const archetypeNameDumps = sqliteTable(
-  'archetype_name_dumps',
-  {
-    id: text('id').primaryKey(), // combination
-    combination: text('combination').notNull(),
-    rawText: text('raw_text').notNull(),
-    parsedSuccessfully: integer('parsed_successfully').default(0),
-    createdAt: integer('created_at').default(sql`CURRENT_TIMESTAMP`),
-  },
-  () => []
-);
-
 export const generations = sqliteTable(
   'generations',
   {

package/drizzle.config.ts

@@ -1,9 +1,9 @@
 import { defineConfig } from 'drizzle-kit';
 
 export default defineConfig({
-  schema: './db/schema.ts', 
+  schema: './db/schema.ts',
   out: './db/migrations',
   dialect: 'sqlite',
-  driver: 'd1-http', 
+  driver: 'd1-http',
   casing: 'snake_case',
 });

package/package.json

@@ -1,19 +1,23 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.401",
+  "version": "0.0.402",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "migrate-latest-test": "wrangler d1 execute DB --file=$(ls -t ./db/migrations/*.sql | head -n 1)",
-    "migrate-latest": "wrangler d1 execute DB --file=$(ls -t ./db/migrations/*.sql | head -n 1) --remote --yes",
+    "migrate-latest-dev": "wrangler d1 execute DB --file=$(ls -t ./db/migrations/*.sql | head -n 1) --env ${ENV:-development}",
+    "migrate-latest-prod": "wrangler d1 execute DB --file=$(ls -t ./db/migrations/*.sql | head -n 1) --remote --yes --env ${ENV:-production}",
+    "migrate-latest-stg": "wrangler d1 execute DB --file=$(ls -t ./db/migrations/*.sql | head -n 1) --remote --yes --env ${ENV:-staging}",
     "db:generate": "drizzle-kit generate",
     "db:up": "drizzle-kit up",
     "pub:db": "npm run db:generate && npm run db:up && npm run migrate-latest && npm version patch && npm publish",
+    "pub:db:prod": "ENV=production npm run db:generate && npm run db:up && npm run migrate-latest-prod && npm version patch && npm publish",
+    "pub:db:stg": "ENV=staging npm run db:generate && npm run db:up && npm run migrate-latest-stg && npm version patch && npm publish",
+    "pub:db:dev": "ENV=development npm run db:generate && npm run db:up && npm run migrate-latest-dev && npm version patch && npm publish",
     "pub": "npm version patch && npm publish",
-    "reset-db": "wrangler d1 execute DB --command \"DROP TABLE IF EXISTS migrations;\" && npm run db:up && npm run migrate-latest"
+    "reset-db": "wrangler d1 execute DB --command \"DROP TABLE IF EXISTS migrations;\" --env ${ENV:-development} && npm run db:up && npm run migrate-latest"
   },
   "devDependencies": {
     "@types/inversify": "^2.0.33",
@@ -34,6 +38,7 @@
     "openai": "^4.81.0",
     "p-map": "^7.0.3",
     "reflect-metadata": "^0.2.2",
-    "uuid": "^11.0.5"
+    "uuid": "^11.0.5",
+    "wrangler": "4"
   }
 }

package/types/scopes/cloudflare.ts

@@ -1,7 +1,6 @@
 import {
   Ai,
   D1Database,
-  DurableObjectNamespace,
   KVNamespace,
   Queue,
   R2Bucket,
@@ -17,43 +16,20 @@ export type SECRETS_STORE_SECRET = {
 };
 
 export type CentralBindings = {
-  TEST_IMAGES_BUCKET: R2Bucket;
   COSMIC_MIRROR_BUCKET: R2Bucket;
   CONCEPTS_BUCKET: R2Bucket;
   PHOTOS_BUCKET: R2Bucket;
   WHEEL_BUCKET: R2Bucket;
   OPENAI_API_KEY: string;
   LEONARDO_API_KEY: string;
-  DESCRIBER_API_KEY: string;
-  DESCRIBER_APP_ID: string;
-  AKOOL_API_KEY: string;
-  KV_COSMIC_MIRROR_ARCHETYPES: KVNamespace;
-  KV_COSMIC_MIRROR_MANAGEMENT: KVNamespace;
-  KV_CONCEPTS: KVNamespace;
-  KV_CONCEPTS_MANAGEMENT: KVNamespace;
   KV_ASTRO: KVNamespace;
   KV_CONCEPT_FAILURES: KVNamespace;
-  KV_CONCEPT_NAMES: KVNamespace;
   KV_API_USAGE: KVNamespace;
-  KV_CONCEPT_CACHE: KVNamespace;
   KV_OAUTH_STATE: KVNamespace;
   CONCEPT_GENERATION_QUEUE: Queue;
-  CONCEPT_NAMES_DO: DurableObjectNamespace;
-  CROWN_QUEUE: Queue;
-  SCEPTER_QUEUE: Queue;
-  RING_QUEUE: Queue;
-  AMULET_QUEUE: Queue;
-  LANTERN_QUEUE: Queue;
-  ORB_QUEUE: Queue;
   ARCHETYPE_POPULATION_QUEUE: Queue;
   FACESWAP_QUEUE: Queue;
   PAYMENT_QUEUE: Queue;
-
-  PROMPT_IMAGE_DESCRIBER: string;
-  PROMPT_GENERATE_ARCHETYPE_BASIC_INFO: string;
-  PROMPT_GENERATE_ARCHETYPE_CONTENT: string;
-  PROMPT_GENERATE_ARCHETYPE_LEONARDO_PROMPTS: string;
-  NEGATIVE_PROMPT_LEONARDO: string;
   PROMPT_PERSONALIZE_COSMIC_MIRROR_LEONARDO_PROMPT: string;
   AI: Ai;
   DB: D1Database;
@@ -72,6 +48,7 @@ export type CentralBindings = {
   FACEBOOK_OAUTH_CLIENT_ID: string;
   FACEBOOK_OAUTH_CLIENT_SECRET: string;
   OAUTH_REDIRECT_URI: string;
+  REDIRECT_PREFIX: string;
   ASTROLOGY_WESTERN_USER_ID: string;
   ASTROLOGY_WESTERN_API_KEY: string;
   ASTROLOGY_PDF_USER_ID: string;
@@ -85,11 +62,6 @@ export type CentralBindings = {
   ASAAS_API_KEY: string;
 
   API_BASE_URL: string;
-  PUBLIC_GOOGLE_CLIENT_ID: string;
-  PUBLIC_FACEBOOK_CLIENT_ID: string;
-  PUBLIC_APP_NAME: string;
-  PUBLIC_APP_VERSION: string;
-  PUBLIC_ANALYTICS_ID?: string;
 };
 
 export type Variables = {
@@ -105,27 +77,14 @@ export type Variables = {
 export type BackendBindings = Env &
   Pick<
     CentralBindings,
-    | 'TEST_IMAGES_BUCKET'
     | 'COSMIC_MIRROR_BUCKET'
     | 'CONCEPTS_BUCKET'
     | 'PHOTOS_BUCKET'
     | 'WHEEL_BUCKET'
     | 'OPENAI_API_KEY'
     | 'LEONARDO_API_KEY'
-    | 'DESCRIBER_API_KEY'
-    | 'DESCRIBER_APP_ID'
-    | 'AKOOL_API_KEY'
-    | 'KV_COSMIC_MIRROR_ARCHETYPES'
-    | 'KV_COSMIC_MIRROR_MANAGEMENT'
-    | 'KV_CONCEPTS'
     | 'KV_ASTRO'
-    | 'KV_CONCEPTS_MANAGEMENT'
     | 'KV_CONCEPT_FAILURES'
-    | 'KV_CONCEPT_NAMES'
-    | 'PROMPT_IMAGE_DESCRIBER'
-    | 'PROMPT_GENERATE_ARCHETYPE_CONTENT'
-    | 'PROMPT_GENERATE_ARCHETYPE_LEONARDO_PROMPTS'
-    | 'NEGATIVE_PROMPT_LEONARDO'
     | 'PROMPT_PERSONALIZE_COSMIC_MIRROR_LEONARDO_PROMPT'
     | 'DB'
     | 'JWT_SECRET'
@@ -134,6 +93,7 @@ export type BackendBindings = Env &
     | 'GOOGLE_SERVER_URL'
     | 'FACEBOOK_SERVER_URL'
     | 'OAUTH_REDIRECT_URI'
+    | 'REDIRECT_PREFIX'
     | 'ASTROLOGY_WESTERN_API_KEY'
     | 'ASTROLOGY_WESTERN_USER_ID'
     | 'ASTROLOGY_PDF_API_KEY'
@@ -142,19 +102,10 @@ export type BackendBindings = Env &
     | 'PIAPI_API_KEY'
     | 'CONCEPT_GENERATION_QUEUE'
     | 'DEEPSEEK_API_KEY'
-    | 'PROMPT_GENERATE_ARCHETYPE_BASIC_INFO'
     | 'TOGETHER_API_KEY'
-    | 'CONCEPT_NAMES_DO'
     | 'API_BASE_URL'
-    | 'CROWN_QUEUE'
-    | 'AMULET_QUEUE'
-    | 'SCEPTER_QUEUE'
-    | 'RING_QUEUE'
-    | 'LANTERN_QUEUE'
-    | 'ORB_QUEUE'
     | 'ARCHETYPE_POPULATION_QUEUE'
     | 'KV_API_USAGE'
-    | 'KV_CONCEPT_CACHE'
     | 'ENV'
     | 'FACESWAP_QUEUE'
     | 'ASAAS_API_KEY'
@@ -171,27 +122,6 @@ export type BackendCtx = Context<
   {}
 >;
 
-export type FrontendBindings = Pick<
-  CentralBindings,
-  | 'API_BASE_URL'
-  | 'PUBLIC_GOOGLE_CLIENT_ID'
-  | 'PUBLIC_FACEBOOK_CLIENT_ID'
-  | 'PUBLIC_APP_NAME'
-  | 'PUBLIC_APP_VERSION'
-  | 'PUBLIC_ANALYTICS_ID'
-  | 'KV_API_USAGE'
-  | 'ENV'
->;
-
-export type FrontCtx = Context<
-  {
-    Bindings: FrontendBindings;
-    Variables: Variables;
-  },
-  any,
-  {}
->;
-
 export type AuthBindings = Env &
   Pick<
     CentralBindings,
@@ -220,49 +150,3 @@ export type AuthCtx = Context<
   any,
   {}
 >;
-
-export type Bindings = Env & {
-  TEST_IMAGES_BUCKET: R2Bucket;
-  PHOTOS_BUCKET: R2Bucket;
-  OPENAI_API_KEY: string;
-  LEONARDO_API_KEY: string;
-  DESCRIBER_API_KEY: string;
-  DESCRIBER_APP_ID: string;
-  AKOOL_API_KEY: string;
-  KV_GENERATION_MANAGEMENT: KVNamespace;
-  KV_USER_GENERATIONS: KVNamespace;
-  KV_COSMIC_MIRROR_ARCHETYPES: KVNamespace;
-  KV_LEONARDO_PROMPTS: KVNamespace;
-  KV_TEST: KVNamespace;
-  PROMPT_IMAGE_DESCRIBER: string;
-  PROMPT_GENERATE_ARCHETYPE: string;
-  PROMPT_GENERATE_LEONARDO: string;
-  NEGATIVE_PROMPT_LEONARDO: string;
-  PROMPT_GENERATE_USER_LUMINOUS_SELF: string;
-  AI: Ai;
-  DB: D1Database;
-  JWT_SECRET: string;
-  CLOUDFLARE_DATABASE_ID: string;
-  CLOUDFLARE_D1_TOKEN: string;
-  CLOUDFLARE_ACCOUNT_ID: string;
-  ISSUER: string;
-  GOOGLE_API_KEY: string;
-  GOOGLE_SERVER_URL: string;
-  GOOGLE_CLIENT_ID: string;
-  GOOGLE_CLIENT_SECRET: string;
-  FACEBOOK_SERVER_URL: string;
-  FACEBOOK_CLIENT_ID: string;
-  FACEBOOK_CLIENT_SECRET: string;
-  OAUTH_REDIRECT_URI: string;
-  ASTROLOGY_API_USER: string;
-  ASTROLOGY_API_KEY: string;
-};
-
-export type Ctx = Context<
-  {
-    Bindings: Bindings;
-    Variables: Variables;
-  },
-  any,
-  {}
->;

package/types/scopes/generic.ts

@@ -549,7 +549,6 @@ export interface AstroFeature {
   userId: string;
   featureType: string;
   percentage: number | null;
-  order: number | null;
   prominentId: number | null;
 }
 

package/utils/buildMessages.ts

@@ -3,7 +3,6 @@ import {
   BackendBindings,
   ChatMessages,
   Concept,
-  Crown,
 } from '../types';
 import { astroPrompts } from './astroPrompts';
 import { conceptPrompts } from './conceptPrompts';
@@ -116,7 +115,7 @@ export const buildLLMMessages = (env: BackendBindings) => ({
     combination: string;
   }): ChatMessages => {
     const [sun, ascendant, moon] = combination.split('-');
-  
+
     return [
       {
         role: 'system',
@@ -458,36 +457,6 @@ export const buildLLMMessages = (env: BackendBindings) => ({
     },
   ],
 
-  // generateCosmicMirrorArchetypeContent: ({
-  //   name,
-  //   description,
-  //   sun,
-  //   ascendant,
-  //   moon,
-  // }: {
-  //   name: string;
-  //   description: string;
-  //   sun: string;
-  //   ascendant: string;
-  //   moon: string;
-  // }): ChatMessages => [
-  //   {
-  //     role: 'system',
-  //     content: env.PROMPT_GENERATE_ARCHETYPE_CONTENT,
-  //   },
-  //   {
-  //     role: 'user',
-  //     content: `
-  //       Generate a detailed archetype description using the following inputs:
-
-  //       Archetype Name: ${name}
-  //       Archetype Description: ${description}
-  //       Sun Sign: ${sun}
-  //       Ascendant Sign: ${ascendant}
-  //       Moon Sign: ${moon}
-  //     `,
-  //   },
-  // ],
   personalizeCosmicMirrorLeonardoPrompt: ({
     leonardoPrompt,
     traits,

package/wrangler.toml

@@ -1,8 +1,29 @@
-# wrangler.toml in shared folder
 name = "shared-migrations"
 compatibility_date = "2024-12-10"
 
-[[ d1_databases ]]
+# Default (used for local/dev if no env specified)
+[[d1_databases]]
+binding = "DB"
+database_name = "zodic-db-dev"
+database_id = "23e0ee5c-6a17-40ee-b731-4f52913501db"
+
+# Production environment
+[env.production]
+[[env.production.d1_databases]]
 binding = "DB"
 database_name = "zodic-db"
-database_id = "b4b0a981-f921-4258-ad7a-b2d7b50eb381"
+database_id = "b4b0a981-f921-4258-ad7a-b2d7b50eb381"
+
+# Staging environment
+[env.staging]
+[[env.staging.d1_databases]]
+binding = "DB"
+database_name = "zodic-db-stg"
+database_id = "3ef831f8-c65e-4e6b-b8b8-934628da14cf"
+
+# Development environment
+[env.development]
+[[env.development.d1_databases]]
+binding = "DB"
+database_name = "zodic-db-dev"
+database_id = "23e0ee5c-6a17-40ee-b731-4f52913501db"