ralsina/Functions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use pg pool, too flaky for now

Browse Source
This commit is contained in:
Roberto Alsina 2024-08-21 18:18:35 -03:00
parent dbbf7224b3
commit 9190060c52
5 changed files with 70 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
busqueda/funko.cr
View File

@ -1,5 +1,6 @@
require "json" require "json"
require "kemal" require "kemal"
require "db"
require "pg" require "pg"
require "pool/connection" require "pool/connection"
@ -11,11 +12,6 @@ DBHOST = File.read("/secrets/dbhost").strip
DBURL = "postgres://#{USER}:#{PASS}@#{DBHOST}:5432/nombres" DBURL = "postgres://#{USER}:#{PASS}@#{DBHOST}:5432/nombres"
puts "Connnecting to #{DBURL}" puts "Connnecting to #{DBURL}"
# Create a connection pool to the database
pg = ConnectionPool.new(capacity: 25, timeout: 1.seconds) do
PG.connect(DBURL)
end
def normalize(s : String) : String def normalize(s : String) : String
s.unicode_normalize(:nfkd) s.unicode_normalize(:nfkd)
.chars.reject! { |character| .chars.reject! { |character|
@ -25,6 +21,7 @@ end
# A basic hello world get endpoint # A basic hello world get endpoint
post "/" do |env| post "/" do |env|
db = DB.open DBURL
prefijo = env.params.json["p"].as(String) prefijo = env.params.json["p"].as(String)
genero = env.params.json["g"].as(String) genero = env.params.json["g"].as(String)
year = env.params.json["a"].as(String) year = env.params.json["a"].as(String)
@ -35,34 +32,33 @@ post "/" do |env|
end end
datos = [] of Tuple(String, Int32 | String) datos = [] of Tuple(String, Int32 | String)
# Connect using credentials provided # Connect using credentials provided
pg.connection do |cursor| if prefijo.empty? && year.empty?
if prefijo.empty? && year.empty? result_set = db.query("
result_set = cursor.query("
SELECT nombre, total::integer SELECT nombre, total::integer
FROM totales FROM totales
ORDER BY total DESC ORDER BY total DESC
LIMIT 50") LIMIT 50")
elsif prefijo.empty? && !year.empty? elsif prefijo.empty? && !year.empty?
# Per-year totals # Per-year totals
result_set = cursor.query(" result_set = db.query("
SELECT nombre, contador::integer SELECT nombre, contador::integer
FROM nombres FROM nombres
WHERE WHERE
anio = $1 anio = $1
ORDER BY contador DESC ORDER BY contador DESC
LIMIT 50", year) LIMIT 50", year)
elsif !prefijo.empty? && year.empty? elsif !prefijo.empty? && year.empty?
# Filter only by prefix # Filter only by prefix
result_set = cursor.query(" result_set = db.query("
SELECT nombre, total::integer SELECT nombre, total::integer
FROM totales FROM totales
WHERE WHERE
nombre LIKE $1 nombre LIKE $1
ORDER BY total DESC ORDER BY total DESC
LIMIT 50", prefijo + "%") LIMIT 50", prefijo + "%")
elsif !prefijo.empty? && !year.empty? elsif !prefijo.empty? && !year.empty?
# We have both # We have both
result_set = cursor.query(" result_set = db.query("
SELECT nombre, contador::integer SELECT nombre, contador::integer
FROM nombres FROM nombres
WHERE WHERE
@ -70,20 +66,19 @@ post "/" do |env|
nombre LIKE $2 nombre LIKE $2
ORDER BY contador DESC ORDER BY contador DESC
LIMIT 50", year, prefijo + "%") LIMIT 50", year, prefijo + "%")
end end
if !result_set.nil? if !result_set.nil?
result_set.each do result_set.each do
nombre = result_set.read(String) nombre = result_set.read(String)
valor = result_set.read(Int32) valor = result_set.read(Int32)
datos.push({nombre, valor}) datos.push({nombre, valor})
end
result_set.close
end end
result_set.close
end
if datos.empty? if datos.empty?
raise "No data found" raise "No data found"
end
end end
# In this context, remove all composite names # In this context, remove all composite names
datos.reject! { |row| datos.reject! { |row|
@ -92,39 +87,37 @@ post "/" do |env|
datos.insert(0, {"Nombre", "Cuantos?"}) datos.insert(0, {"Nombre", "Cuantos?"})
if genero if genero
pg.connection do |cursor| datos.reject! { |row|
datos.reject! { |row| # How feminine is this name?
# How feminine is this name? # Yes this database is upper case
# Yes this database is upper case puts "Checking #{row[1]} #{row[0]}"
puts "Checking #{row[1]} #{row[0]}" feminidad = 0
feminidad = 0 sql = %(
sql = %(
SELECT COALESCE((SELECT frecuencia FROM mujeres WHERE nombre='#{row[0]?.to_s.upcase}'), 0) AS mujeres, SELECT COALESCE((SELECT frecuencia FROM mujeres WHERE nombre='#{row[0]?.to_s.upcase}'), 0) AS mujeres,
COALESCE((SELECT frecuencia FROM hombres WHERE nombre='#{row[0]?.to_s.upcase}'), 0) AS hombres COALESCE((SELECT frecuencia FROM hombres WHERE nombre='#{row[0]?.to_s.upcase}'), 0) AS hombres
) )
puts "SQL: #{sql}" puts "SQL: #{sql}"
cursor.query sql do |result_set| db.query sql do |result_set|
result_set.each do result_set.each do
mujeres = result_set.read(Int32) mujeres = result_set.read(Int32)
hombres = result_set.read(Int32) hombres = result_set.read(Int32)
puts "frecuencias: #{mujeres} #{hombres}" puts "frecuencias: #{mujeres} #{hombres}"
if hombres == mujeres == 0 if hombres == mujeres == 0
feminidad = 0.5 feminidad = 0.5
else else
feminidad = mujeres / (hombres + mujeres) feminidad = mujeres / (hombres + mujeres)
end
end end
end end
# El overlap en 0.5 es intencional! end
if (feminidad >= 0.5 && genero == "f") || # El overlap en 0.5 es intencional!
(feminidad <= 0.5 && genero == "m") if (feminidad >= 0.5 && genero == "f") ||
false (feminidad <= 0.5 && genero == "m")
else false
true else
end true
} end
puts "Data split by gender" }
end puts "Data split by gender"
end end
datos = datos[..10].map { |row| datos = datos[..10].map { |row|
[row[0].capitalize, row[1]] [row[0].capitalize, row[1]]
@ -141,9 +134,14 @@ post "/" do |env|
"title" => title, "title" => title,
"data" => datos, "data" => datos,
}.to_json }.to_json
ensure
db.try &.close
end end
get "/ping/" do get "/ping/" do
pg.connection.exec("SELECT 42") db = DB.open DBURL
db.exec("SELECT 42")
"OK" "OK"
ensure
db.try &.close
end end

12
deploy.sh
View File

@ -1,14 +1,14 @@
#!/bin/sh -x #!/bin/sh -x
set -e set -e
#export OPENFAAS_URL=http://pinky:8082 export OPENFAAS_URL=http://pinky:8082
#pass faas.ralsina.me | faas-cli login -u admin --password-stdin pass faas.ralsina.me | faas-cli login -u admin --password-stdin
#pass iol-pass | faas-cli secret create iol-pass pass iol-pass | faas-cli secret create iol-pass
#pass iol-user | faas-cli secret create iol-user pass iol-user | faas-cli secret create iol-user
#pass iol-api-secret | faas-cli secret create iol-api-secret pass iol-api-secret | faas-cli secret create iol-api-secret
#pass nombres-user | faas-cli secret create nombres-user #pass nombres-user | faas-cli secret create nombres-user
#pass nombres-pass | faas-cli secret create nombres-pass #pass nombres-pass | faas-cli secret create nombres-pass
#faas-cli deploy -f functions.yml $* faas-cli deploy -f functions.yml $*
export FAASO_SERVER=http://rocky:8888/admin export FAASO_SERVER=http://rocky:8888/admin
pass faaso-rocky | faaso login pass faaso-rocky | faaso login

4
functions.yml
View File

@ -3,10 +3,6 @@ provider:
name: openfaas name: openfaas
gateway: http://pinky:8082 gateway: http://pinky:8082
functions: functions:
tapas:
lang: python3-flask
handler: ./tapas
image: ralsina/tapas:latest
iol: iol:
lang: python3-fastapi lang: python3-fastapi
handler: ./iol handler: ./iol

21
historico/funko.cr
View File

@ -11,11 +11,6 @@ DBHOST = File.read("/secrets/dbhost").strip
DBURL = "postgres://#{USER}:#{PASS}@#{DBHOST}:5432/nombres" DBURL = "postgres://#{USER}:#{PASS}@#{DBHOST}:5432/nombres"
puts "Connnecting to #{DBURL}" puts "Connnecting to #{DBURL}"
# Create a connection pool to the database
pg = ConnectionPool.new(capacity: 25, timeout: 1.seconds) do
PG.connect(DBURL)
end
# Connect to the database and get information about # Connect to the database and get information about
# the requested names # the requested names
get "/" do |env| get "/" do |env|
@ -31,7 +26,7 @@ get "/" do |env|
results << [anio.to_s] results << [anio.to_s]
end end
# Connect using credentials provided # Connect using credentials provided
pg.connection do |cursor| db = DB.open DBURL
# Get the information for each name # Get the information for each name
names.map do |name| names.map do |name|
# Normalize: remove diacritics etc. # Normalize: remove diacritics etc.
@ -41,7 +36,7 @@ get "/" do |env|
}.join("").downcase }.join("").downcase
counter_per_year = {} of Int32 => Int32 counter_per_year = {} of Int32 => Int32
cursor.query(" db.query("
SELECT anio::integer, contador::integer SELECT anio::integer, contador::integer
FROM nombres WHERE nombre = $1", name) do |result_set| FROM nombres WHERE nombre = $1", name) do |result_set|
result_set.each do result_set.each do
@ -52,15 +47,15 @@ get "/" do |env|
results[anio - 1921] << counter_per_year.fetch(anio, 0).to_s results[anio - 1921] << counter_per_year.fetch(anio, 0).to_s
end end
end end
end
results.to_json results.to_json
ensure
db.try &.close
end end
# The `/ping/` endpoint is configured in the container as a healthcheck
# You can make it better by checking that your database is responding
# or whatever checks you think are important
#
get "/ping/" do get "/ping/" do
pg.connection.exec("SELECT 42") db = DB.open DBURL
db.exec("SELECT 42")
"OK" "OK"
ensure
db.try &.close
end end

7
nombres.ralsina.me/index.html
View File

@ -306,12 +306,7 @@
id="nombres" id="nombres"
placeholder="Nombres separados con comas" placeholder="Nombres separados con comas"
aria-label="Search" aria-label="Search"
<<<<<<< Updated upstream value="juan,maria"
value="Juan, María"
||||||| Stash base
=======
value="juan,maria"
>>>>>>> Stashed changes
/> />
<input type="submit" value="Buscar" onCLick="drawChart2();" /> <input type="submit" value="Buscar" onCLick="drawChart2();" />
</form> </form>