Tarot readings have a topic: general, relationship, work, self-knowledge
The new reading form starts with the topic; it steers how the model reads the cards (with the topic's own limits, e.g. no break-up predictions for relationships) and shows on the reading and in the list. Readings from before count as general. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -117,6 +117,67 @@ pub fn spread(id: &str) -> Option<&'static Spread> {
|
||||
SPREADS.iter().find(|s| s.id == id)
|
||||
}
|
||||
|
||||
/// What the reading is about: it steers how the cards are read.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct Topic {
|
||||
pub id: &'static str,
|
||||
pub name: &'static str,
|
||||
/// The instruction for the model (Hungarian, English).
|
||||
pub focus: (&'static str, &'static str),
|
||||
}
|
||||
|
||||
pub const TOPICS: [Topic; 4] = [
|
||||
Topic {
|
||||
id: "general",
|
||||
name: "Általános",
|
||||
focus: (
|
||||
"Általános jóslás: az olvasó élete egészére vonatkoztasd a lapokat.",
|
||||
"A general reading: relate the cards to the reader's life as a whole.",
|
||||
),
|
||||
},
|
||||
Topic {
|
||||
id: "love",
|
||||
name: "Párkapcsolat",
|
||||
focus: (
|
||||
"Párkapcsolati jóslás: minden lapot a szerelem, a vonzalom, a közelség, a bizalom és a kommunikáció \
|
||||
szemszögéből olvass, akár van kapcsolata az olvasónak, akár keres. Ne feltételezd a partner nemét, és ne \
|
||||
jósolj szakítást, hűtlenséget vagy azt, hogy valaki biztosan visszatér.",
|
||||
"A relationship reading: read every card through love, attraction, closeness, trust and communication, \
|
||||
whether the reader is in a relationship or looking for one. Do not assume the partner's gender, and do \
|
||||
not predict a break-up, infidelity or that someone will surely come back.",
|
||||
),
|
||||
},
|
||||
Topic {
|
||||
id: "work",
|
||||
name: "Munka és hivatás",
|
||||
focus: (
|
||||
"Munka és hivatás: a lapokat a munka, a hivatás, a tanulás, a munkahelyi kapcsolatok és a fejlődés \
|
||||
szemszögéből olvasd. Ne adj pénzügyi vagy jogi tanácsot, és ne jósolj elbocsátást vagy anyagi \
|
||||
nyereséget, veszteséget.",
|
||||
"Work and calling: read the cards through work, vocation, learning, relationships at work and growth. \
|
||||
Give no financial or legal advice, and do not predict dismissal or financial gains or losses.",
|
||||
),
|
||||
},
|
||||
Topic {
|
||||
id: "self",
|
||||
name: "Önismeret",
|
||||
focus: (
|
||||
"Önismeret: a lapokat a belső világ, az érzelmek, a minták és a lelki fejlődés szemszögéből olvasd; a \
|
||||
külső események helyett arra figyelj, mit tanulhat az olvasó önmagáról.",
|
||||
"Self-knowledge: read the cards through the inner world, feelings, patterns and inner growth; rather \
|
||||
than outer events, focus on what the reader can learn about themselves.",
|
||||
),
|
||||
},
|
||||
];
|
||||
|
||||
/// A topic by id (`None`, and readings from before topics: general).
|
||||
pub fn topic(id: Option<&str>) -> Option<&'static Topic> {
|
||||
match id {
|
||||
None => TOPICS.first(),
|
||||
Some(id) => TOPICS.iter().find(|t| t.id == id),
|
||||
}
|
||||
}
|
||||
|
||||
/// The Hungarian name of a zodiac sign as the charts store it ("cancer").
|
||||
pub fn sign_hu(sign: &str) -> &'static str {
|
||||
match sign.to_ascii_lowercase().as_str() {
|
||||
@@ -142,6 +203,7 @@ pub fn sign_hu(sign: &str) -> &'static str {
|
||||
/// The cards are in the order of the spread's positions.
|
||||
pub struct Reading<'a> {
|
||||
pub spread: &'static Spread,
|
||||
pub topic: &'static Topic,
|
||||
pub question: Option<&'a str>,
|
||||
/// (card, reversed) per position.
|
||||
pub cards: Vec<(&'static Card, bool)>,
|
||||
@@ -171,6 +233,7 @@ impl<'a> Reading<'a> {
|
||||
let text = |k: &str| value[k].as_str().map(str::trim).filter(|s| !s.is_empty());
|
||||
Ok(Self {
|
||||
spread,
|
||||
topic: topic(text("topic")).ok_or("unknown topic")?,
|
||||
question: text("question"),
|
||||
cards,
|
||||
sun: text("sun"),
|
||||
@@ -284,12 +347,18 @@ pub fn build_tarot(language: &str, reading: &Reading) -> Prompt {
|
||||
let hu = language == "hu";
|
||||
let mut user = String::new();
|
||||
let none = if hu { "nincs megadva" } else { "not given" };
|
||||
user.push_str(&format!(
|
||||
"{}: {}. {}\n\n",
|
||||
if hu { "Téma" } else { "Topic" },
|
||||
reading.topic.name,
|
||||
if hu { reading.topic.focus.0 } else { reading.topic.focus.1 },
|
||||
));
|
||||
match reading.question {
|
||||
Some(q) => user.push_str(&format!("{}: {}\n\n", if hu { "A kérdés" } else { "The question" }, q.trim())),
|
||||
None => user.push_str(if hu {
|
||||
"Nincs konkrét kérdés: az olvasó a jelenlegi életszakaszára kér útmutatást.\n\n"
|
||||
"Nincs konkrét kérdés: az olvasó a témában a jelenlegi életszakaszára kér útmutatást.\n\n"
|
||||
} else {
|
||||
"No specific question: the reader asks for guidance about their present phase of life.\n\n"
|
||||
"No specific question: the reader asks for guidance on the topic in their present phase of life.\n\n"
|
||||
}),
|
||||
}
|
||||
let sign = |s: Option<&str>| {
|
||||
@@ -369,6 +438,8 @@ mod tests {
|
||||
"sun": "cancer", "moon": "pisces", "ascendant": null});
|
||||
let reading = Reading::parse(&value).unwrap();
|
||||
let prompt = build_tarot("hu", &reading);
|
||||
// Readings without a topic (the first ones) are general.
|
||||
assert!(prompt.user.starts_with("Téma: Általános."));
|
||||
assert!(prompt.user.contains("A kérdés: Merre induljak tovább?"));
|
||||
assert!(prompt.user.contains("Nap: Rák, Hold: Halak, Aszcendens: nincs megadva"));
|
||||
assert!(prompt.user.contains("2. Jelenlegi fókusz"));
|
||||
@@ -380,6 +451,15 @@ mod tests {
|
||||
let english = build_tarot("en", &reading);
|
||||
assert!(english.user.contains("Sun: Cancer") && english.system.contains("English"));
|
||||
|
||||
let mut love = value.clone();
|
||||
love["topic"] = json!("love");
|
||||
let prompt = build_tarot("hu", &Reading::parse(&love).unwrap());
|
||||
assert!(
|
||||
prompt.user.starts_with("Téma: Párkapcsolat.") && prompt.user.contains("Ne feltételezd a partner nemét")
|
||||
);
|
||||
love["topic"] = json!("pénz");
|
||||
assert!(Reading::parse(&love).is_err());
|
||||
|
||||
let wrong = json!({"spread": "daily", "cards": [{"card": "major-0"}, {"card": "major-1"}]});
|
||||
assert!(Reading::parse(&wrong).is_err());
|
||||
assert!(Reading::parse(&json!({"spread": "daily", "cards": [{"card": "nincs"}]})).is_err());
|
||||
|
||||
Reference in New Issue
Block a user